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

Fix inconsistent formatting

parent 8f07b13a

src/common/api/admire_types.hpp

+10 −8
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ struct fmt::formatter<admire::job> : formatter<std::string_view> { 
    auto

    format(const admire::job& j, FormatContext& ctx) const {

        return formatter<std::string_view>::format(

                fmt::format("id: {}", j.id()), ctx);

                fmt::format("{{id: {}}}", j.id()), ctx);

    }

};
@@ -438,7 +438,8 @@ struct fmt::formatter<admire::dataset> : formatter<std::string_view> { 
    template <typename FormatContext>

    auto

    format(const admire::dataset& d, FormatContext& ctx) const {

        return formatter<std::string_view>::format("\"" + d.id() + "\"", ctx);

        const auto str = fmt::format("{{id: {}}}", std::quoted(d.id()));

        return formatter<std::string_view>::format(str, ctx);

    }

};
@@ -448,7 +449,8 @@ struct fmt::formatter<admire::node> : formatter<std::string_view> { 
    template <typename FormatContext>

    auto

    format(const admire::node& n, FormatContext& ctx) const {

        const auto str = fmt::format("hostname: {}", std::quoted(n.hostname()));

        const auto str =

                fmt::format("{{hostname: {}}}", std::quoted(n.hostname()));

        return formatter<std::string_view>::format(str, ctx);

    }

};
@@ -655,9 +657,8 @@ struct fmt::formatter<admire::job_requirements> : formatter<std::string_view> { 
    auto

    format(const admire::job_requirements& r, FormatContext& ctx) const {

        return formatter<std::string_view>::format(

                fmt::format("inputs: [{}], outputs: [{}], storage: {}",

                            fmt::join(r.inputs(), ", "),

                            fmt::join(r.outputs(), ", "), r.storage()),

                fmt::format("{{inputs: {}, outputs: {}, storage: {}}}",

                            r.inputs(), r.outputs(), r.storage()),

                ctx);

    }

};
@@ -722,7 +723,8 @@ struct fmt::formatter<std::optional<admire::qos::entity>> 
                break;

        }



        const auto str = fmt::format("scope: {}, data: {}", e->scope(), data);

        const auto str =

                fmt::format("{{scope: {}, data: {}}}", e->scope(), data);

        return formatter<std::string_view>::format(str, ctx);

    }

};
@@ -796,7 +798,7 @@ struct fmt::formatter<admire::transfer> : formatter<std::string_view> { 
    template <typename FormatContext>

    auto

    format(const admire::transfer& tx, FormatContext& ctx) const {

        const auto str = fmt::format("id: {}", tx.id());

        const auto str = fmt::format("{{id: {}}}", tx.id());

        return formatter<std::string_view>::format(str, ctx);

    }

};

src/lib/detail/impl.cpp

+7 −8
Original line number Diff line number Diff line
@@ -177,8 +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);
@@ -194,7 +193,7 @@ register_job(const admire::server& srv, const admire::job_requirements& reqs) { 


    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;
@@ -207,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 ({}): {{job: {{{}}}, job_requirements: {{{}}}}}",

                "ADM_update_job", 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);
@@ -266,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);
@@ -291,8 +290,8 @@ transfer_dataset(const server& srv, const job& job, 


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



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

                __FUNCTION__, ADM_SUCCESS, tx);

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

                ADM_SUCCESS, tx);

    return tx;

}

src/scord/rpc_handlers.cpp

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

                __FUNCTION__, reqs);

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

                reqs);



    const auto job = admire::job{42};
@@ -77,8 +77,8 @@ 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__, rv, job);

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

                rv, job);



    ret = margo_respond(h, &out);

    assert(ret == HG_SUCCESS);
@@ -110,8 +110,8 @@ 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, __FUNCTION__, job, reqs);

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

                __FUNCTION__, job, reqs);



    admire::error_code rv = ADM_SUCCESS;

    out.retval = rv;
@@ -147,7 +147,7 @@ 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;
@@ -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);