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

Minor reformat to log messages

parent dde43a07

src/lib/detail/impl.cpp

+11 −11
Original line number Diff line number Diff line
@@ -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;
@@ -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_dataset(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_dataset(const server& srv, const job& job, 
            endp.call("ADM_transfer_dataset", &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;

}

src/scord/rpc_handlers.cpp

+8 −8
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 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 {} ({}) <= {{job_requirements: {}}}", id, __FUNCTION__,

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

                reqs);



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

    out.job = admire::api::convert(job).release();



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

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

                rv, job);



    ret = margo_respond(h, &out);
@@ -110,13 +110,13 @@ 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 {} ({}) <= {{job: {}, job_requirements: {}}}", id,

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

                __FUNCTION__, job, reqs);



    admire::error_code rv = ADM_SUCCESS;

    out.retval = rv;



    LOGGER_INFO("RPC ID {} ({}) => {{retval: {}}}", id, __FUNCTION__, rv);

    LOGGER_INFO("RPC ID {} ({}) <= {{retval: {}}}", id, __FUNCTION__, rv);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);
@@ -147,12 +147,12 @@ ADM_remove_job(hg_handle_t h) { 
    const admire::job job(in.job);



    const auto id = remote_procedure::new_id();

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

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



    admire::error_code rv = ADM_SUCCESS;

    out.retval = rv;



    LOGGER_INFO("RPC ID {} ({}) => {{retval: {}}}", id, __FUNCTION__, rv);

    LOGGER_INFO("RPC ID {} ({}) <= {{retval: {}}}", id, __FUNCTION__, rv);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);
@@ -990,7 +990,7 @@ ADM_transfer_dataset(hg_handle_t h) { 
    const auto mapping = static_cast<admire::transfer::mapping>(in.mapping);



    const auto id = remote_procedure::new_id();

    LOGGER_INFO("RPC ID {} ({}) <= {{job: {}, sources: {}, targets: {}, "

    LOGGER_INFO("RPC ID {} ({}) => {{job: {}, sources: {}, targets: {}, "

                "limits: {}, mapping: {}}}",

                id, __FUNCTION__, job, sources, targets, limits, mapping);
@@ -1001,7 +1001,7 @@ ADM_transfer_dataset(hg_handle_t h) { 
    out.retval = rv;

    out.tx = admire::api::convert(transfer).release();



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

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

                __FUNCTION__, rv, transfer);



    ret = margo_respond(h, &out);