Verified Commit 33280a87 authored by Alberto Miranda's avatar Alberto Miranda ♨️
Browse files

Fix logging for ADM_register_job, ADM_update_job, and ADM_remove_job

parent 0fc2880e

src/lib/detail/impl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ register_job(const admire::server& srv, const admire::job_requirements& reqs) { 
    LOGGER_INFO("rpc id: {} name: {} from: {} <= "

                "body: {{retval: {}, job: {}}} [op_id: {}]",

                rpc_id, std::quoted("ADM_"s + __FUNCTION__),

                std::quoted(rpc.origin()), ADM_SUCCESS, job.id(), out.op_id);

                std::quoted(rpc.origin()), ADM_SUCCESS, job, out.op_id);



    return job;

}

src/scord/rpc_handlers.cpp

+10 −8
Original line number Diff line number Diff line
@@ -138,17 +138,18 @@ ADM_update_job(hg_handle_t h) { 
    const admire::job_requirements reqs(&in.reqs);



    const auto id = remote_procedure::new_id();

    LOGGER_INFO("RPC ID {} ({}) => "

    LOGGER_INFO("rpc id: {} name: {} from: {} => "

                "body: {{job: {}, job_requirements: {}}}",

                id, std::quoted(__FUNCTION__), job, reqs);

                id, std::quoted(__FUNCTION__), std::quoted(get_address(h)), job,

                reqs);



    admire::error_code rv = ADM_SUCCESS;

    out.op_id = id;

    out.retval = rv;



    LOGGER_INFO("RPC ID {} ({}) <= "

    LOGGER_INFO("rpc id: {} name: {} to: {} <= "

                "body: {{retval: {}}}",

                id, std::quoted(__FUNCTION__), rv);

                id, std::quoted(__FUNCTION__), std::quoted(get_address(h)), rv);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);
@@ -181,17 +182,18 @@ ADM_remove_job(hg_handle_t h) { 
    const admire::job job(in.job);



    const auto id = remote_procedure::new_id();

    LOGGER_INFO("RPC ID {} ({}) => "

    LOGGER_INFO("rpc id: {} name: {} from: {} => "

                "body: {{job: {}}}",

                id, std::quoted(__FUNCTION__), job);

                id, std::quoted(__FUNCTION__), std::quoted(get_address(h)),

                job);



    admire::error_code rv = ADM_SUCCESS;

    out.op_id = id;

    out.retval = rv;



    LOGGER_INFO("RPC ID {} ({}) <= "

    LOGGER_INFO("rpc id: {} name: {} to: {} <= "

                "body: {{retval: {}}}",

                id, std::quoted(__FUNCTION__), rv);

                id, std::quoted(__FUNCTION__), std::quoted(get_address(h)), rv);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);