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

Rename connection to conninfo

This commit is contained in:
zhouzb 2019-09-16 17:22:50 +08:00
parent 1667cbd359
commit 600cd11f1f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emqx_connection.erl
View File

@ -135,7 +135,7 @@ attrs(CPid) when is_pid(CPid) ->
attrs(Conn = #connection{chan_state = ChanState}) -> attrs(Conn = #connection{chan_state = ChanState}) ->
ConnAttrs = info(?ATTR_KEYS, Conn), ConnAttrs = info(?ATTR_KEYS, Conn),
ChanAttrs = emqx_channel:attrs(ChanState), ChanAttrs = emqx_channel:attrs(ChanState),
maps:merge(ChanAttrs, #{connection => maps:from_list(ConnAttrs)}). maps:merge(ChanAttrs, #{conninfo => maps:from_list(ConnAttrs)}).
%% @doc Get stats of the channel. %% @doc Get stats of the channel.
-spec(stats(pid()|connection()) -> emqx_types:stats()). -spec(stats(pid()|connection()) -> emqx_types:stats()).

2
src/emqx_ws_connection.erl
View File

@ -76,7 +76,7 @@ info(WsPid) when is_pid(WsPid) ->
info(WsConn = #ws_connection{chan_state = ChanState}) -> info(WsConn = #ws_connection{chan_state = ChanState}) ->
ConnInfo = info(?INFO_KEYS, WsConn), ConnInfo = info(?INFO_KEYS, WsConn),
ChanInfo = emqx_channel:info(ChanState), ChanInfo = emqx_channel:info(ChanState),
maps:merge(ChanInfo, #{connection => maps:from_list(ConnInfo)}). maps:merge(ChanInfo, #{conninfo => maps:from_list(ConnInfo)}).
info(Keys, WsConn) when is_list(Keys) -> info(Keys, WsConn) when is_list(Keys) ->
[{Key, info(Key, WsConn)} || Key <- Keys]; [{Key, info(Key, WsConn)} || Key <- Keys];