yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(rebalance api): fix error message formatting

This commit is contained in:
Ilya Averyanov 2023-06-07 13:57:16 +03:00
parent 783f6933a3
commit d1a1e8041d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/emqx_node_rebalance/src/emqx_node_rebalance_api.erl
View File

@ -258,11 +258,11 @@ wrap_rpc(Node, RPCResult) ->
{200, #{}}; {200, #{}};
{error, Reason} -> {error, Reason} ->
error_response( 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} -> {badrpc, Reason} ->
error_response( 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. end.
@ -299,9 +299,9 @@ with_nodes_at_key(Key, Params, Fun) ->
{ok, Params1} -> {ok, Params1} ->
Fun(Params1); Fun(Params1);
{error, {unavailable, Nodes}} -> {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, {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. end.
parse_node(Bin) when is_binary(Bin) -> parse_node(Bin) when is_binary(Bin) ->
@ -331,6 +331,8 @@ without(Keys, Props) ->
Props Props
). ).
binfmt(Fmt, Args) -> iolist_to_binary(io_lib:format(Fmt, Args)).
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------
%% Schema %% Schema
%%------------------------------------------------------------------------------ %%------------------------------------------------------------------------------