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

Revert "Fix websocket bug. Prior to this change, websocket connection would be closed directly without sending connack packet when acl check fails." 

This reverts commit e73c4c64d0.
This commit is contained in:
turtleDeng 2019-06-12 15:51:01 +08:00
parent e73c4c64d0
commit a3103cec7b
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_connection.erl
View File

@ -301,6 +301,7 @@ websocket_info(Info, State) ->
terminate(SockError, _Req, #state{keepalive = Keepalive,
proto_state = ProtoState,
shutdown = Shutdown}) ->
?LOG(debug, "[WS Connection] Terminated for ~p, sockerror: ~p", [Shutdown, SockError]),
emqx_keepalive:cancel(Keepalive),
case {ProtoState, Shutdown} of
@ -326,8 +327,7 @@ ensure_stats_timer(State) ->
State.
shutdown(Reason, State) ->
self() ! {stop, State#state{shutdown = Reason}},
{ok, State}.
{stop, State#state{shutdown = Reason}}.
wsock_stats() ->
[{Key, emqx_pd:get_counter(Key)} || Key <- ?SOCK_STATS].