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

Merge pull request #6801 from k32/bpapi-mgmt3 

refactor(emqx_mgmt): Decorate get_full_config RPC
This commit is contained in:
k32 2022-01-19 14:42:20 +01:00 committed by GitHub
parent 80e8790482 6940a41743
commit 5a9f289f1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -158,12 +158,12 @@ configs(get, Params, _Req) ->
case case
lists:member(Node, mria_mnesia:running_nodes()) lists:member(Node, mria_mnesia:running_nodes())
andalso andalso
rpc:call(Node, ?MODULE, get_full_config, []) emqx_management_proto_v1: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}}; {500, #{code => 'BAD_NODE', message => Message}};
{error, {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}};
Res -> Res ->

6
apps/emqx_management/src/proto/emqx_management_proto_v1.erl
View File

@ -32,6 +32,8 @@
, unsubscribe/3 , unsubscribe/3
, call_client/3 , call_client/3
, get_full_config/1
]). ]).
-include_lib("emqx/include/bpapi.hrl"). -include_lib("emqx/include/bpapi.hrl").
@ -77,3 +79,7 @@ unsubscribe(Node, ClientId, Topic) ->
-spec call_client(node(), emqx_types:clientid(), term()) -> term(). -spec call_client(node(), emqx_types:clientid(), term()) -> term().
call_client(Node, ClientId, Req) -> call_client(Node, ClientId, Req) ->
rpc:call(Node, emqx_mgmt, do_call_client, [ClientId, Req]). rpc:call(Node, emqx_mgmt, do_call_client, [ClientId, Req]).
-spec get_full_config(node()) -> map() | list() | {badrpc, _}.
get_full_config(Node) ->
rpc:call(Node, emqx_mgmt_api_configs, get_full_config, []).