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

fix(emqx_mgmt_api_configs): use 'node' query paramter if given 

also fix result in error case - be compliant to schema and also return correct
http status code
This commit is contained in:
Stefan Strigler 2022-11-03 17:04:11 +01:00
parent c0efccd54f
commit 8b10b78bce
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqx_management/src/emqx_mgmt_api_configs.erl
View File

@ -103,7 +103,9 @@ schema("/configs") ->
)} )}
], ],
responses => #{ responses => #{
200 => lists:map(fun({_, Schema}) -> Schema end, config_list()) 200 => lists:map(fun({_, Schema}) -> Schema end, config_list()),
404 => emqx_dashboard_swagger:error_codes(['NOT_FOUND']),
500 => emqx_dashboard_swagger:error_codes(['BAD_NODE'])
} }
} }
}; };
@ -311,14 +313,15 @@ config_reset(post, _Params, Req) ->
end. end.
configs(get, Params, _Req) -> configs(get, Params, _Req) ->
Node = maps:get(node, Params, node()), QS = maps:get(query_string, Params, #{}),
Node = maps:get(<<"node">>, QS, node()),
case case
lists:member(Node, mria_mnesia:running_nodes()) andalso lists:member(Node, mria_mnesia:running_nodes()) andalso
emqx_management_proto_v2:get_full_config(Node) emqx_management_proto_v2:get_full_config(Node)
of of
false -> false ->
Message = list_to_binary(io_lib:format("Bad node ~p, reason not found", [Node])), Message = list_to_binary(io_lib:format("Bad node ~p, reason not found", [Node])),
{500, #{code => 'BAD_NODE', message => Message}}; {404, #{code => 'NOT_FOUND', message => Message}};
{badrpc, R} -> {badrpc, R} ->
Message = list_to_binary(io_lib:format("Bad node ~p, reason ~p", [Node, R])), Message = list_to_binary(io_lib:format("Bad node ~p, reason ~p", [Node, R])),
{500, #{code => 'BAD_NODE', message => Message}}; {500, #{code => 'BAD_NODE', message => Message}};