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

Merge pull request #6847 from DDDHuang/fix_clients_sub_api 

fix: client subscriptions api
This commit is contained in:
Shawn 2022-01-25 13:30:54 +08:00 committed by GitHub
parent a3e3f2216c e07ecd5211
commit 68616f1be4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/emqx_management/src/emqx_mgmt.erl
View File

@ -269,11 +269,14 @@ list_authz_cache(ClientId) ->
list_client_subscriptions(ClientId) -> list_client_subscriptions(ClientId) ->
Results = [client_subscriptions(Node, ClientId) || Node <- mria_mnesia:running_nodes()], Results = [client_subscriptions(Node, ClientId) || Node <- mria_mnesia:running_nodes()],
Expected = lists:filter(fun({error, _}) -> false; Filter =
([]) -> false; fun
(_) -> true ({error, _}) ->
end, Results), false;
case Expected of ({_Node, List}) ->
erlang:is_list(List) andalso 0 < erlang:length(List)
end,
case lists:filter(Filter, Results) of
[] -> []; [] -> [];
[Result | _] -> Result [Result | _] -> Result
end. end.

20
apps/emqx_management/src/emqx_mgmt_api_clients.erl
View File

@ -513,11 +513,21 @@ subscribe_batch(post, #{bindings := #{clientid := ClientID}, body := TopicInfos}
subscribe_batch(#{clientid => ClientID, topics => Topics}). subscribe_batch(#{clientid => ClientID, topics => Topics}).
subscriptions(get, #{bindings := #{clientid := ClientID}}) -> subscriptions(get, #{bindings := #{clientid := ClientID}}) ->
{Node, Subs0} = emqx_mgmt:list_client_subscriptions(ClientID), case emqx_mgmt:list_client_subscriptions(ClientID) of
Subs = lists:map(fun({Topic, SubOpts}) -> [] ->
#{node => Node, clientid => ClientID, topic => Topic, qos => maps:get(qos, SubOpts)} {200, []};
end, Subs0), {Node, Subs} ->
{200, Subs}. Formatter =
fun({Topic, SubOpts}) ->
#{
node => Node,
clientid => ClientID,
topic => Topic,
qos => maps:get(qos, SubOpts)
}
end,
{200, lists:map(Formatter, Subs)}
end.
set_keepalive(put, #{bindings := #{clientid := ClientID}, query_string := Query}) -> set_keepalive(put, #{bindings := #{clientid := ClientID}, query_string := Query}) ->
case maps:find(<<"interval">>, Query) of case maps:find(<<"interval">>, Query) of