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

fix(ws): avoid funcation_clause for un-inited websocket

This commit is contained in:
JianBo He 2021-06-11 11:48:44 +08:00
parent 074c0bd2cc
commit bbed1b55e0
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/emqx.appup.src
View File

@ -2,9 +2,12 @@
{VSN, {VSN,
[ [
{"4.3.3", {"4.3.3",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]}
]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}, {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},
@ -41,9 +44,12 @@
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]}, {load_module,emqx_http_lib,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.3.3", [{"4.3.3",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]}
]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_packet,brutal_purge,soft_purge,[]}, [{load_module,emqx_packet,brutal_purge,soft_purge,[]},
{load_module,emqx_ws_connection,brutal_purge,soft_purge,[]},
{load_module,emqx_http_lib,brutal_purge,soft_purge,[]}, {load_module,emqx_http_lib,brutal_purge,soft_purge,[]},
{load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},

5
src/emqx_ws_connection.erl
View File

@ -403,7 +403,10 @@ websocket_close(Reason, State) ->
terminate(Reason, _Req, #state{channel = Channel}) -> terminate(Reason, _Req, #state{channel = Channel}) ->
?LOG(debug, "Terminated due to ~p", [Reason]), ?LOG(debug, "Terminated due to ~p", [Reason]),
emqx_channel:terminate(Reason, Channel). emqx_channel:terminate(Reason, Channel);
terminate(_Reason, _Req, _UnExpectedState) ->
ok.
%%-------------------------------------------------------------------- %%--------------------------------------------------------------------
%% Handle call %% Handle call