From eb7ae13ae9de2ce87c5983ef20868c43199169d2 Mon Sep 17 00:00:00 2001 From: GilbertWong Date: Tue, 16 Jul 2019 01:33:15 +0800 Subject: [PATCH] Better exit reason in websocket channel --- src/emqx_ws_channel.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emqx_ws_channel.erl b/src/emqx_ws_channel.erl index 57cfd3cd6..9571baab8 100644 --- a/src/emqx_ws_channel.erl +++ b/src/emqx_ws_channel.erl @@ -316,7 +316,7 @@ terminate(SockError, _Req, #state{keepalive = Keepalive, exit(Reason); {_, Error} -> emqx_protocol:terminate(Error, ProtoState), - exit({error, Error}) + exit({error, SockError}) end. %%-------------------------------------------------------------------- @@ -346,7 +346,7 @@ ensure_stats_timer(State) -> shutdown(Reason, State) -> %% Fix the issue#2591(https://github.com/emqx/emqx/issues/2591#issuecomment-500278696) self() ! {stop, {shutdown, Reason}}, - {ok, State#state{shutdown = {shutdown, Reason}}}. + {ok, State}. wsock_stats() -> [{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS].