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

Merge pull request #2710 from emqx/master 

merge from master to release-3.2
This commit is contained in:
Shawn 2019-07-20 19:15:44 +08:00 committed by GitHub
parent 43cf0fbab4 3410151c24
commit 155eb82283
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) -> websocket_info({shutdown, Reason}, State) ->
shutdown(Reason, State); shutdown(Reason, State);
websocket_info({stop, Reason}, State) -> websocket_info(stop, State) ->
{stop, State#state{shutdown = Reason}}; {stop, State};
websocket_info(Info = {'EXIT', SessionPid, Reason}, State = #state{proto_state = ProtoState}) -> websocket_info(Info = {'EXIT', SessionPid, Reason}, State = #state{proto_state = ProtoState}) ->
case emqx_protocol:session(ProtoState) of case emqx_protocol:session(ProtoState) of
@ -363,12 +363,12 @@ ensure_stats_timer(State) ->
State. State.
shutdown(Reason = {shutdown, _}, State) -> shutdown(Reason = {shutdown, _}, State) ->
self() ! {stop, Reason}, self() ! stop,
{ok, State}; {ok, State#state{shutdown = Reason}};
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,
{ok, State}. {ok, State#state{shutdown = {shutdown, Reason}}}.
wsock_stats() -> wsock_stats() ->
[{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS]. [{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS].