From f37de3a4a7334e5bcb4edec19e70d366f6cecff3 Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 17 Jun 2015 13:30:34 +0800 Subject: [PATCH 1/3] willmsg --- apps/emqttd/src/emqttd_protocol.erl | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/apps/emqttd/src/emqttd_protocol.erl b/apps/emqttd/src/emqttd_protocol.erl index 2c07abbee..ad5d69a3e 100644 --- a/apps/emqttd/src/emqttd_protocol.erl +++ b/apps/emqttd/src/emqttd_protocol.erl @@ -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), From 16b9c7a43801abfe09cb3f3227b2fe5617a44da7 Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 17 Jun 2015 13:34:09 +0800 Subject: [PATCH 2/3] 0.8.6 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8b61e4a7..88690f432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ emqttd ChangeLog ================== +0.8.6-beta (2015-06-17) +------------------------- + +Bugfix: issue #175 - publish Will message when websocket is closed without 'DISCONNECT' packet + + 0.8.5-beta (2015-06-10) ------------------------- From d991e30135f4b9a912e90c04e0637b99a1184917 Mon Sep 17 00:00:00 2001 From: Feng Date: Wed, 17 Jun 2015 14:20:27 +0800 Subject: [PATCH 3/3] rel --- go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go b/go index ac0709fd1..7e7d9d1dd 100755 --- a/go +++ b/go @@ -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