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

Merge pull request #7418 from HJianBo/fix-sys-for-gwname 

fix(sys): compatible with binary type protocol
This commit is contained in:
JianBo He 2022-03-31 15:34:34 +08:00 committed by GitHub
parent 13e4feef13 8431387408
commit 04bc484b6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/emqx/src/emqx_sys.erl
View File

@ -365,10 +365,13 @@ event_topic(Event, #{clientid := ClientId, protocol := GwName}) ->
[ [
systop("gateway"), systop("gateway"),
"/", "/",
atom_to_binary(GwName), bin(GwName),
"/clients/", "/clients/",
ClientId, ClientId,
"/", "/",
atom_to_binary(Event) bin(Event)
] ]
). ).
bin(A) when is_atom(A) -> atom_to_binary(A);
bin(B) when is_binary(B) -> B.

11
apps/emqx_gateway/src/exproto/emqx_exproto_channel.erl
View File

@ -610,7 +610,7 @@ enrich_conninfo(InClientInfo, ConnInfo) ->
enrich_clientinfo(InClientInfo = #{proto_name := ProtoName}, ClientInfo) -> enrich_clientinfo(InClientInfo = #{proto_name := ProtoName}, ClientInfo) ->
Ks = [clientid, username, mountpoint], Ks = [clientid, username, mountpoint],
NClientInfo = maps:merge(ClientInfo, maps:with(Ks, InClientInfo)), NClientInfo = maps:merge(ClientInfo, maps:with(Ks, InClientInfo)),
NClientInfo#{protocol => ProtoName}. NClientInfo#{protocol => proto_name_to_protocol(ProtoName)}.
default_conninfo(ConnInfo) -> default_conninfo(ConnInfo) ->
ConnInfo#{clean_start => true, ConnInfo#{clean_start => true,
@ -619,6 +619,8 @@ default_conninfo(ConnInfo) ->
conn_mod => undefined, conn_mod => undefined,
conn_props => #{}, conn_props => #{},
connected => true, connected => true,
proto_name => <<"exproto">>,
proto_ver => <<"1.0">>,
connected_at => erlang:system_time(millisecond), connected_at => erlang:system_time(millisecond),
keepalive => 0, keepalive => 0,
receive_maximum => 0, receive_maximum => 0,
@ -627,7 +629,7 @@ default_conninfo(ConnInfo) ->
default_clientinfo(#{peername := {PeerHost, _}, default_clientinfo(#{peername := {PeerHost, _},
sockname := {_, SockPort}}) -> sockname := {_, SockPort}}) ->
#{zone => default, #{zone => default,
protocol => undefined, protocol => exproto,
peerhost => PeerHost, peerhost => PeerHost,
sockport => SockPort, sockport => SockPort,
clientid => undefined, clientid => undefined,
@ -642,3 +644,8 @@ stringfy(Reason) ->
fmt_from(undefined) -> <<>>; fmt_from(undefined) -> <<>>;
fmt_from(Bin) when is_binary(Bin) -> Bin; fmt_from(Bin) when is_binary(Bin) -> Bin;
fmt_from(T) -> stringfy(T). fmt_from(T) -> stringfy(T).
proto_name_to_protocol(<<>>) ->
exproto;
proto_name_to_protocol(ProtoName) when is_binary(ProtoName) ->
binary_to_atom(ProtoName).