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

fix(appup): load_module emqx_access_control

This commit is contained in:
EMQ-YangM 2022-03-25 11:15:23 +08:00
parent 0ffb66ee7f
commit 3eab6b436b
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl
View File

@ -1017,7 +1017,7 @@ t_events(_Config) ->
]),
ct:pal("====== verify $events/client_connected, $events/client_connack"),
client_connected(Client, Client2),
ct:pal("====== verify $events/session_subscribed"),
ct:pal("====== verify $events/session_subscribed, $events/client_check_acl_complete"),
session_subscribed(Client2),
ct:pal("====== verify t1"),
message_publish(Client),
@ -1044,7 +1044,6 @@ client_connected(Client, Client2) ->
verify_event('client.connack'),
verify_event('client.connected'),
ok.
client_disconnected(Client, Client2) ->
ok = emqtt:disconnect(Client, 0, #{'User-Property' => {<<"reason">>, <<"normal">>}}),
ok = emqtt:disconnect(Client2, 0, #{'User-Property' => {<<"reason">>, <<"normal">>}}),

6
src/emqx.appup.src
View File

@ -2,7 +2,8 @@
%% Unless you know what you are doing, DO NOT edit manually!!
{VSN,
[{"4.4.1",
[{load_module,emqx_frame,brutal_purge,soft_purge,[]},
[{load_module,emqx_access_control,brutal_purge,soft_purge,[]},
{load_module,emqx_frame,brutal_purge,soft_purge,[]},
{load_module,emqx_misc,brutal_purge,soft_purge,[]},
{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_session,brutal_purge,soft_purge,[]},
@ -44,7 +45,8 @@
{load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}],
[{"4.4.1",
[{load_module,emqx_frame,brutal_purge,soft_purge,[]},
[{load_module,emqx_access_control,brutal_purge,soft_purge,[]},
{load_module,emqx_frame,brutal_purge,soft_purge,[]},
{load_module,emqx_misc,brutal_purge,soft_purge,[]},
{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_session,brutal_purge,soft_purge,[]},

1
src/emqx_access_control.erl
View File

@ -51,7 +51,6 @@ check_acl(ClientInfo, PubSub, Topic) ->
end,
inc_acl_metrics(Result),
emqx:run_hook('client.check_acl_complete', [ClientInfo, PubSub, Topic, Result]),
%% io:format(standard_error, "~p, ~p, ~p, ~p, ~n", [ClientInfo, PubSub, Topic, Result]),
Result.
check_acl_cache(ClientInfo, PubSub, Topic) ->