From 3eab6b436bdf44ee267e07d9b7384864620f4e54 Mon Sep 17 00:00:00 2001 From: EMQ-YangM Date: Fri, 25 Mar 2022 11:15:23 +0800 Subject: [PATCH] fix(appup): load_module emqx_access_control --- apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl | 3 +-- src/emqx.appup.src | 6 ++++-- src/emqx_access_control.erl | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl index 136db6695..bc4f968aa 100644 --- a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl +++ b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl @@ -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">>}}), diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 383db43f1..372e26df7 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -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,[]}, diff --git a/src/emqx_access_control.erl b/src/emqx_access_control.erl index 8de296a6d..4598bea38 100644 --- a/src/emqx_access_control.erl +++ b/src/emqx_access_control.erl @@ -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) ->