This commit is contained in:
Feng Lee 2015-06-24 02:51:56 +08:00
parent 82bd645d7a
commit b4080a0adf
1 changed files with 2 additions and 3 deletions

View File

@ -53,7 +53,7 @@ client_connected(ConnAck, #mqtt_client{clientid = ClientId,
{session, Sess}, {session, Sess},
{protocol, ProtoVer}, {protocol, ProtoVer},
{connack, ConnAck}, {connack, ConnAck},
{ts, emqttd_vm:timestamp()}]), {ts, emqttd_util:now_to_secs()}]),
Message = #mqtt_message{from = presence, Message = #mqtt_message{from = presence,
qos = proplists:get_value(qos, Opts, 0), qos = proplists:get_value(qos, Opts, 0),
topic = topic(connected, ClientId), topic = topic(connected, ClientId),
@ -61,7 +61,7 @@ client_connected(ConnAck, #mqtt_client{clientid = ClientId,
emqttd_pubsub:publish(Message). emqttd_pubsub:publish(Message).
client_disconnected(Reason, ClientId, Opts) -> client_disconnected(Reason, ClientId, Opts) ->
Json = mochijson2:encode([{reason, reason(Reason)}, {ts, emqttd_vm:timestamp()}]), Json = mochijson2:encode([{reason, reason(Reason)}, {ts, emqttd_util:now_to_secs()}]),
emqttd_pubsub:publish(#mqtt_message{from = presence, emqttd_pubsub:publish(#mqtt_message{from = presence,
qos = proplists:get_value(qos, Opts, 0), qos = proplists:get_value(qos, Opts, 0),
topic = topic(disconnected, ClientId), topic = topic(disconnected, ClientId),
@ -71,7 +71,6 @@ unload(_Opts) ->
emqttd_broker:unhook(client_connected, {?MODULE, client_connected}), emqttd_broker:unhook(client_connected, {?MODULE, client_connected}),
emqttd_broker:unhook(client_disconnected, {?MODULE, client_disconnected}). emqttd_broker:unhook(client_disconnected, {?MODULE, client_disconnected}).
topic(connected, ClientId) -> topic(connected, ClientId) ->
emqttd_topic:systop(list_to_binary(["clients/", ClientId, "/connected"])); emqttd_topic:systop(list_to_binary(["clients/", ClientId, "/connected"]));
topic(disconnected, ClientId) -> topic(disconnected, ClientId) ->