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

Merge remote-tracking branch 'origin/develop'

This commit is contained in:
zhanghongtong 2019-06-20 10:49:01 +08:00
parent b9715b9e71 ffbb598a73
commit 65ae10a651
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqx_mod_presence.erl
View File

@ -51,7 +51,7 @@ on_client_connected(#{client_id := ClientId,
username => Username, username => Username,
ipaddress => iolist_to_binary(esockd_net:ntoa(IpAddr)), ipaddress => iolist_to_binary(esockd_net:ntoa(IpAddr)),
connack => ConnAck, connack => ConnAck,
ts => os:system_time(second) ts => erlang:system_time(millisecond)
}) of }) of
{ok, Payload} -> {ok, Payload} ->
emqx:publish(message(qos(Env), topic(connected, ClientId), Payload)); emqx:publish(message(qos(Env), topic(connected, ClientId), Payload));
@ -63,7 +63,7 @@ on_client_disconnected(#{client_id := ClientId, username := Username}, Reason, E
case emqx_json:safe_encode([{clientid, ClientId}, case emqx_json:safe_encode([{clientid, ClientId},
{username, Username}, {username, Username},
{reason, reason(Reason)}, {reason, reason(Reason)},
{ts, os:system_time(second)}]) of {ts, erlang:system_time(millisecond)}]) of
{ok, Payload} -> {ok, Payload} ->
emqx_broker:publish(message(qos(Env), topic(disconnected, ClientId), Payload)); emqx_broker:publish(message(qos(Env), topic(disconnected, ClientId), Payload));
{error, Reason} -> {error, Reason} ->