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

Better exit reason in websocket channel

This commit is contained in:
GilbertWong 2019-07-16 01:33:15 +08:00
parent 1fc0f61fbb
commit eb7ae13ae9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emqx_ws_channel.erl
View File

@ -316,7 +316,7 @@ terminate(SockError, _Req, #state{keepalive = Keepalive,
exit(Reason); exit(Reason);
{_, Error} -> {_, Error} ->
emqx_protocol:terminate(Error, ProtoState), emqx_protocol:terminate(Error, ProtoState),
exit({error, Error}) exit({error, SockError})
end. end.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
@ -346,7 +346,7 @@ ensure_stats_timer(State) ->
shutdown(Reason, State) -> shutdown(Reason, State) ->
%% Fix the issue#2591(https://github.com/emqx/emqx/issues/2591#issuecomment-500278696) %% Fix the issue#2591(https://github.com/emqx/emqx/issues/2591#issuecomment-500278696)
self() ! {stop, {shutdown, Reason}}, self() ! {stop, {shutdown, Reason}},
{ok, State#state{shutdown = {shutdown, Reason}}}. {ok, State}.
wsock_stats() -> wsock_stats() ->
[{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS]. [{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS].