Verified Commit 8b558cf8 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Improve logging output for ADM_register_job

parent 4baa8416

src/lib/detail/impl.cpp

+4 −3
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ register_job(const admire::server& srv, const admire::job_requirements& reqs) { 


    auto endp = rpc_client.lookup(srv.address());



    LOGGER_INFO("RPC ({}): {{{}}}", "ADM_register_job", reqs);

    LOGGER_INFO("RPC (ADM_{}) => {{job_requirements: {{{}}}}}", __FUNCTION__,

                reqs);



    auto rpc_reqs = managed_rpc_type<admire::job_requirements>{reqs};
@@ -178,14 +179,14 @@ register_job(const admire::server& srv, const admire::job_requirements& reqs) { 
    endp.call("ADM_register_job", &in, &out);



    if(out.retval < 0) {

        LOGGER_ERROR("RPC ({}) = {}", "ADM_register_job", out.retval);

        LOGGER_ERROR("RPC (ADM_{}) <= {}", __FUNCTION__, out.retval);

        return tl::make_unexpected(static_cast<admire::error_code>(out.retval));

    }



    const auto rpc_job = managed_rpc_type<ADM_job_t>{out.job};

    const admire::job job = rpc_job.get();



    LOGGER_INFO("RPC ({}) = {{{}, job: {{{}}}}}", "ADM_register_job",

    LOGGER_INFO("RPC (ADM_{}) <= {{retval: {}, job: {{{}}}}}", __FUNCTION__,

                ADM_SUCCESS, job.id());



    return job;

src/scord/rpc_handlers.cpp

+4 −3
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ ADM_register_job(hg_handle_t h) { 
    const admire::job_requirements reqs(&in.reqs);



    const auto id = remote_procedure::new_id();

    LOGGER_INFO("RPC ID {} ({}): {{{}}}", id, __FUNCTION__, reqs);

    LOGGER_INFO("RPC ID {} ({}) <= {{job_requirements: {{{}}}}}", id,

                __FUNCTION__, reqs);



    const auto job = admire::job{42};
@@ -76,8 +77,8 @@ ADM_register_job(hg_handle_t h) { 
    out.retval = rv;

    out.job = rpc_job.get();



    LOGGER_INFO("RPC ID {} ({}) = {{{}, job: {{{}}}}}", id, __FUNCTION__, rv,

                job);

    LOGGER_INFO("RPC ID {} ({}) => {{retval: {}, job: {{{}}}}}", id,

                __FUNCTION__, rv, job);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);