From 78dd1f8838f5ea1908da9c3acee700eca73233cc Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Wed, 23 Dec 2015 22:33:49 +0800
Subject: [PATCH] fix issue #413

---
 src/emqttd_ws_client.erl | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/emqttd_ws_client.erl b/src/emqttd_ws_client.erl
index 9529ba42a..196e7d5d1 100644
--- a/src/emqttd_ws_client.erl
+++ b/src/emqttd_ws_client.erl
@@ -223,8 +223,18 @@ handle_info({keepalive, check}, State = #wsclient_state{request   = Req,
 handle_info({'EXIT', WsPid, Reason}, State = #wsclient_state{ws_pid = WsPid}) ->
     stop(Reason, State);
 
+handle_info({'EXIT', SessPid, Reason}, State = #wsclient_state{request     = Req,
+                                                               proto_state = ProtoState}) ->
+    case emqttd_protocol:session(ProtoState) of
+        SessPid ->
+            stop(Reason, State);
+        ExitPid ->
+            ?WSLOG(error, "Unexpected EXIT ~p for ~p", [ExitPid, Reason], Req),
+            noreply(State)
+     end;
+
 handle_info(Info, State = #wsclient_state{request = Req}) ->
-    ?WSLOG(error, "Unexpected Info: ~p", [Info], Req),
+    ?WSLOG(critical, "Unexpected Info: ~p", [Info], Req),
     noreply(State).
 
 terminate(Reason, #wsclient_state{proto_state = ProtoState, keepalive = KeepAlive}) ->