From d1a1e8041d5268440f5a1cafaa678eaf5fd6e745 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Wed, 7 Jun 2023 13:57:16 +0300 Subject: [PATCH] fix(rebalance api): fix error message formatting --- .../src/emqx_node_rebalance_api.erl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/apps/emqx_node_rebalance/src/emqx_node_rebalance_api.erl b/apps/emqx_node_rebalance/src/emqx_node_rebalance_api.erl index d0526f5d5..713e16463 100644 --- a/apps/emqx_node_rebalance/src/emqx_node_rebalance_api.erl +++ b/apps/emqx_node_rebalance/src/emqx_node_rebalance_api.erl @@ -258,11 +258,11 @@ wrap_rpc(Node, RPCResult) -> {200, #{}}; {error, Reason} -> error_response( - 400, ?BAD_REQUEST, io_lib:format("error on node ~p: ~p", [Node, Reason]) + 400, ?BAD_REQUEST, binfmt("error on node ~p: ~p", [Node, Reason]) ); {badrpc, Reason} -> error_response( - 503, ?RPC_ERROR, io_lib:format("RPC error on node ~p: ~p", [Node, Reason]) + 503, ?RPC_ERROR, binfmt("RPC error on node ~p: ~p", [Node, Reason]) ) end. @@ -299,9 +299,9 @@ with_nodes_at_key(Key, Params, Fun) -> {ok, Params1} -> Fun(Params1); {error, {unavailable, Nodes}} -> - error_response(400, ?NOT_FOUND, io_lib:format("Nodes unavailable: ~p", [Nodes])); + error_response(400, ?NOT_FOUND, binfmt("Nodes unavailable: ~p", [Nodes])); {error, {invalid, Nodes}} -> - error_response(400, ?BAD_REQUEST, io_lib:format("Invalid nodes: ~p", [Nodes])) + error_response(400, ?BAD_REQUEST, binfmt("Invalid nodes: ~p", [Nodes])) end. parse_node(Bin) when is_binary(Bin) -> @@ -331,6 +331,8 @@ without(Keys, Props) -> Props ). +binfmt(Fmt, Args) -> iolist_to_binary(io_lib:format(Fmt, Args)). + %%------------------------------------------------------------------------------ %% Schema %%------------------------------------------------------------------------------