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

dump will

This commit is contained in:
Feng Lee 2015-01-11 10:57:46 +08:00
parent b746e57cdb
commit 6c2a5c0b96
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/emqtt/src/emqtt_packet.erl
View File

@ -286,8 +286,14 @@ dump_variable( #mqtt_packet_connect {
will_msg = WillMsg, will_msg = WillMsg,
username = Username, username = Username,
password = Password} ) -> password = Password} ) ->
io_lib:format("ClientId=~s, ProtoName=~s, ProtoVsn=~p, CleanSess=~s, KeepAlive=~p, Username=~s, Password=~s", Format = "ClientId=~s, ProtoName=~s, ProtoVsn=~p, CleanSess=~s, KeepAlive=~p, Username=~s, Password=~s",
[ClientId, ProtoName, ProtoVer, CleanSess, KeepAlive, Username, Password]); %%TODO: Will Args = [ClientId, ProtoName, ProtoVer, CleanSess, KeepAlive, Username, dump_password(Password)],
{Format1, Args1} = if
WillFlag -> { Format ++ ", Will(Qos=~p, Retain=~s, Topic=~s, Msg=~s)",
Args ++ [ WillQoS, WillRetain, WillTopic, WillMsg ] };
true -> {Format, Args}
end,
io_lib:format(Format1, Args1);
dump_variable( #mqtt_packet_connack { dump_variable( #mqtt_packet_connack {
ack_flags = AckFlags, ack_flags = AckFlags,
@ -326,6 +332,9 @@ dump_variable(undefined, <<>>) ->
dump_variable(Variable, Payload) -> dump_variable(Variable, Payload) ->
io_lib:format("~s, Payload=~p", [dump_variable(Variable), Payload]). io_lib:format("~s, Payload=~p", [dump_variable(Variable), Payload]).
dump_password(undefined) -> undefined;
dump_password(_) -> <<"******">>.
dump_type(?CONNECT) -> "CONNECT"; dump_type(?CONNECT) -> "CONNECT";
dump_type(?CONNACK) -> "CONNACK"; dump_type(?CONNACK) -> "CONNACK";
dump_type(?PUBLISH) -> "PUBLISH"; dump_type(?PUBLISH) -> "PUBLISH";