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

Merge pull request #414 from emqtt/issue#413 

Issue#413
This commit is contained in:
Feng Lee 2015-12-23 23:50:43 +08:00
parent 9ecc4330d6 2dd8c3d778
commit 361096e12b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emqttd_ws_client.erl
View File

@ -123,7 +123,8 @@ reset_parser(State = #wsocket_state{packet_opts = PktOpts}) ->
%%%=============================================================================
init([WsPid, Req, ReplyChannel, PktOpts]) ->
process_flag(trap_exit, true),
%%issue#413: trap_exit is unnecessary
%%process_flag(trap_exit, true),
{ok, Peername} = Req:get(peername),
SendFun = fun(Payload) -> ReplyChannel({binary, Payload}) end,
Headers = mochiweb_request:get(headers, Req),
@ -220,11 +221,12 @@ handle_info({keepalive, check}, State = #wsclient_state{request = Req,
shutdown(keepalive_error, State)
end;
handle_info({'EXIT', WsPid, Reason}, State = #wsclient_state{ws_pid = WsPid}) ->
stop(Reason, State);
%%issue#413: removed the trap_exit flag
%%handle_info({'EXIT', WsPid, Reason}, State = #wsclient_state{ws_pid = WsPid}) ->
%% stop(Reason, State);
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}) ->