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

merge

This commit is contained in:
Feng Lee 2015-06-22 15:41:24 +08:00
parent af3faf05db d991e30135
commit 163165ea06
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,10 +2,10 @@
emqttd ChangeLog
==================
0.8.6-beta (2015-06-15)
0.8.6-beta (2015-06-17)
-------------------------
Bugfix: issue #175 - should publish Will message when websocket is closed without 'DISCONNECT' packet
Bugfix: issue #175 - publish Will message when websocket is closed without 'DISCONNECT' packet
0.8.5-beta (2015-06-10)

8
TODO
View File

@ -1,4 +1,12 @@
v0.9.0-alpha (2015-05-30)
-------------------------
Redis
MySQL
v0.9.0-alpha (2015-05-30)
-------------------------

14
apps/emqttd/src/emqttd_protocol.erl
View File

@ -302,20 +302,8 @@ shutdown(duplicate_id, _State) ->
shutdown(_, #proto_state{clientid = undefined}) ->
ignore;
shutdown(normal, #proto_state{peername = Peername, clientid = ClientId, will_msg = WillMsg}) ->
lager:info([{client, ClientId}], "Client ~s@~s: normal shutdown",
[ClientId, emqttd_net:format(Peername)]),
try_unregister(ClientId),
if
WillMsg =/= undefined ->
send_willmsg(ClientId, WillMsg);
true ->
ok
end,
emqttd_broker:foreach_hooks(client_disconnected, [normal, ClientId]);
shutdown(Error, #proto_state{peername = Peername, clientid = ClientId, will_msg = WillMsg}) ->
lager:info([{client, ClientId}], "Protocol ~s@~s: Shutdown for ~p",
lager:info([{client, ClientId}], "Client ~s@~s: shutdown ~p",
[ClientId, emqttd_net:format(Peername), Error]),
send_willmsg(ClientId, WillMsg),
try_unregister(ClientId),

2
go
View File

@ -2,4 +2,4 @@
# -*- tab-width:4;indent-tabs-mode:nil -*-
# ex: ts=4 sw=4 et
make && make dist && cd rel/emqttd && ./bin/emqttd console
make && make rel && cd rel/emqttd && ./bin/emqttd console