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

Merge pull request #2709 from emqx/develop

This commit is contained in:
Shawn 2019-07-20 19:08:57 +08:00 committed by GitHub
parent fa7292560a 0569388f0f
commit 3410151c24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/emqx_ws_channel.erl
View File

@ -296,8 +296,8 @@ websocket_info({binary, Data}, State) ->
websocket_info({shutdown, Reason}, State) ->
shutdown(Reason, State);
websocket_info({stop, Reason}, State) ->
{stop, State#state{shutdown = Reason}};
websocket_info(stop, State) ->
{stop, State};
websocket_info(Info = {'EXIT', SessionPid, Reason}, State = #state{proto_state = ProtoState}) ->
case emqx_protocol:session(ProtoState) of
@ -363,12 +363,12 @@ ensure_stats_timer(State) ->
State.
shutdown(Reason = {shutdown, _}, State) ->
self() ! {stop, Reason},
{ok, State};
self() ! stop,
{ok, State#state{shutdown = Reason}};
shutdown(Reason, State) ->
%% Fix the issue#2591(https://github.com/emqx/emqx/issues/2591#issuecomment-500278696)
self() ! {stop, {shutdown, Reason}},
{ok, State}.
self() ! stop,
{ok, State#state{shutdown = {shutdown, Reason}}}.
wsock_stats() ->
[{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS].