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

fix(management): make client format function durable

This commit is contained in:
JianBo He 2020-12-25 10:15:43 +08:00 committed by Shawn
parent b68a0b3730
commit d628c49f16
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -866,7 +866,11 @@ item(client, {ClientId, ChanPid}) ->
end, end,
ClientInfo = maps:get(clientinfo, Attrs, #{}), ClientInfo = maps:get(clientinfo, Attrs, #{}),
ConnInfo = maps:get(conninfo, Attrs, #{}), ConnInfo = maps:get(conninfo, Attrs, #{}),
Session = maps:get(session, Attrs, #{}), Session = case maps:get(session, Attrs, #{}) of
undefined -> #{};
_Sess -> _Sess
end,
SessCreated = maps:get(created_at, Session, maps:get(connected_at, ConnInfo)),
Connected = case maps:get(conn_state, Attrs) of Connected = case maps:get(conn_state, Attrs) of
connected -> true; connected -> true;
_ -> false _ -> false
@ -889,7 +893,7 @@ item(client, {ClientId, ChanPid}) ->
maps:with([clientid, username, mountpoint, is_bridge, zone], ClientInfo), maps:with([clientid, username, mountpoint, is_bridge, zone], ClientInfo),
maps:with([clean_start, keepalive, expiry_interval, proto_name, maps:with([clean_start, keepalive, expiry_interval, proto_name,
proto_ver, peername, connected_at, disconnected_at], ConnInfo), proto_ver, peername, connected_at, disconnected_at], ConnInfo),
maps:with([created_at], Session)]); #{created_at => SessCreated}]);
item(subscription, {{Topic, ClientId}, Options}) -> item(subscription, {{Topic, ClientId}, Options}) ->
#{topic => Topic, clientid => ClientId, options => Options}; #{topic => Topic, clientid => ClientId, options => Options};