fix issue #671 - fix clientid trace

This commit is contained in:
Feng 2016-09-02 09:11:55 +08:00
parent 10e9abfdec
commit aab2bddeda
1 changed files with 6 additions and 2 deletions

View File

@ -106,9 +106,13 @@ trace(publish, From, _Msg) when is_atom(From) ->
%% Dont' trace '$SYS' publish %% Dont' trace '$SYS' publish
ignore; ignore;
trace(publish, From, #mqtt_message{topic = Topic, payload = Payload}) -> trace(publish, {ClientId, Username}, #mqtt_message{topic = Topic, payload = Payload}) ->
lager:info([{client, ClientId}, {topic, Topic}],
"~s/~s PUBLISH to ~s: ~p", [ClientId, Username, Topic, Payload]);
trace(publish, From, #mqtt_message{topic = Topic, payload = Payload}) when is_binary(From); is_list(From) ->
lager:info([{client, From}, {topic, Topic}], lager:info([{client, From}, {topic, Topic}],
"~p PUBLISH to ~s: ~p", [From, Topic, Payload]). "~s PUBLISH to ~s: ~p", [From, Topic, Payload]).
%% @doc Unsubscribe %% @doc Unsubscribe
-spec(unsubscribe(binary()) -> ok | emqttd:pubsub_error()). -spec(unsubscribe(binary()) -> ok | emqttd:pubsub_error()).