Skip to content
Snippets Groups Projects

Resolve "Issues with logging output for RPCs"

Merged Resolve "Issues with logging output for RPCs"
60-inconsistent-logging-output-for-rpcs into main
Merged Alberto Miranda requested to merge 60-inconsistent-logging-output-for-rpcs into main
Viewing commit 55a7b79c
Next
Show latest version
1 file
+ 13
− 13
Compare changes
  • Side-by-side
  • Inline
src/lib/detail/impl.cpp
+ 15
− 15
@@ -163,10 +163,10 @@ ping(const server& srv) {
auto endp = rpc_client.lookup(srv.address());
LOGGER_INFO("ADM_ping()");
LOGGER_INFO("RPC (ADM_{}) => {{}}", __FUNCTION__);
const auto rpc = endp.call("ADM_ping");
LOGGER_INFO("ADM_register_job() = {}", ADM_SUCCESS);
LOGGER_INFO("RPC (ADM_{}) <= {{ retval: {}}}", __FUNCTION__, ADM_SUCCESS);
return ADM_SUCCESS;
}
@@ -177,7 +177,7 @@ register_job(const admire::server& srv, const admire::job_requirements& reqs) {
auto endp = rpc_client.lookup(srv.address());
LOGGER_INFO("RPC (ADM_{}) <= {{job_requirements: {}}}", __FUNCTION__, reqs);
LOGGER_INFO("RPC (ADM_{}) => {{job_requirements: {}}}", __FUNCTION__, reqs);
auto rpc_reqs = api::convert(reqs);
@@ -187,13 +187,13 @@ register_job(const admire::server& srv, const admire::job_requirements& reqs) {
const auto rpc = endp.call("ADM_register_job", &in, &out);
if(out.retval < 0) {
LOGGER_ERROR("RPC (ADM_{}) => {}", __FUNCTION__, out.retval);
LOGGER_ERROR("RPC (ADM_{}) <= {}", __FUNCTION__, out.retval);
return tl::make_unexpected(static_cast<admire::error_code>(out.retval));
}
const admire::job job = api::convert(out.job);
LOGGER_INFO("RPC (ADM_{}) => {{retval: {}, job: {}}}", __FUNCTION__,
LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}, job: {}}}", __FUNCTION__,
ADM_SUCCESS, job.id());
return job;
@@ -206,8 +206,8 @@ update_job(const server& srv, const job& job, const job_requirements& reqs) {
auto endp = rpc_client.lookup(srv.address());
LOGGER_INFO("RPC (ADM_{}): {{job: {}, job_requirements: {}}}", __FUNCTION__,
job, reqs);
LOGGER_INFO("RPC (ADM_{}) => {{job: {}, job_requirements: {}}}",
__FUNCTION__, job, reqs);
const auto rpc_job = api::convert(job);
const auto rpc_reqs = api::convert(reqs);
@@ -220,11 +220,11 @@ update_job(const server& srv, const job& job, const job_requirements& reqs) {
if(out.retval < 0) {
const auto retval = static_cast<admire::error_code>(out.retval);
LOGGER_ERROR("RPC (ADM_{}) => {{retval: {}}}", __FUNCTION__, retval);
LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, retval);
return retval;
}
LOGGER_INFO("RPC (ADM_{}) => {{retval: {}}}", __FUNCTION__, ADM_SUCCESS);
LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, ADM_SUCCESS);
return ADM_SUCCESS;
}
@@ -235,7 +235,7 @@ remove_job(const server& srv, const job& job) {
auto endp = rpc_client.lookup(srv.address());
LOGGER_INFO("RPC (ADM_{}) <= {{job: {}}}", __FUNCTION__, job);
LOGGER_INFO("RPC (ADM_{}) => {{job: {}}}", __FUNCTION__, job);
const auto rpc_job = api::convert(job);
@@ -246,11 +246,11 @@ remove_job(const server& srv, const job& job) {
if(out.retval < 0) {
const auto retval = static_cast<admire::error_code>(out.retval);
LOGGER_ERROR("RPC (ADM_{}) => {{retval: {}}}", __FUNCTION__, retval);
LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, retval);
return retval;
}
LOGGER_INFO("RPC (ADM_{}) => {{retval: {}}}", __FUNCTION__, ADM_SUCCESS);
LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__, ADM_SUCCESS);
return ADM_SUCCESS;
}
@@ -265,7 +265,7 @@ transfer_datasets(const server& srv, const job& job,
auto endp = rpc_client.lookup(srv.address());
LOGGER_INFO("RPC (ADM_{}) <= {{job: {}, sources: {}, targets: {}, "
LOGGER_INFO("RPC (ADM_{}) => {{job: {}, sources: {}, targets: {}, "
"limits: {}, mapping: {}}}",
__FUNCTION__, job, sources, targets, limits, mapping);
@@ -283,14 +283,14 @@ transfer_datasets(const server& srv, const job& job,
endp.call("ADM_transfer_datasets", &in, &out);
if(out.retval < 0) {
LOGGER_ERROR("RPC (ADM_{}) => {{retval: {}}}", __FUNCTION__,
LOGGER_ERROR("RPC (ADM_{}) <= {{retval: {}}}", __FUNCTION__,
out.retval);
return tl::make_unexpected(static_cast<admire::error_code>(out.retval));
}
const admire::transfer tx = api::convert(out.tx);
LOGGER_INFO("RPC (ADM_{}) => {{retval: {}, transfer: {}}}", __FUNCTION__,
LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}, transfer: {}}}", __FUNCTION__,
ADM_SUCCESS, tx);
return tx;
}