From f732b41c5c8ddda54ca57172fd37dcf80ced3f74 Mon Sep 17 00:00:00 2001 From: firest Date: Thu, 23 Jun 2022 17:15:06 +0800 Subject: [PATCH 1/2] fix(ctl): remove the warning log when the mgmt upgrade --- src/emqx_ctl.erl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/emqx_ctl.erl b/src/emqx_ctl.erl index 094d97135..bf22e562a 100644 --- a/src/emqx_ctl.erl +++ b/src/emqx_ctl.erl @@ -181,7 +181,6 @@ handle_call({register_command, Cmd, MF, Opts}, _From, State = #state{seq = Seq}) case ets:match(?CMD_TAB, {{'$1', Cmd}, '_', '_'}) of [] -> ets:insert(?CMD_TAB, {{Seq, Cmd}, MF, Opts}); [[OriginSeq] | _] -> - ?LOG(warning, "CMD ~s is overidden by ~p", [Cmd, MF]), true = ets:insert(?CMD_TAB, {{OriginSeq, Cmd}, MF, Opts}) end, {reply, ok, next_seq(State)}; From 73b72f40e5d747ea855e128bec8fc4038051b251 Mon Sep 17 00:00:00 2001 From: firest Date: Thu, 23 Jun 2022 17:57:41 +0800 Subject: [PATCH 2/2] chore: update emqx.appup.src --- src/emqx.appup.src | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/emqx.appup.src b/src/emqx.appup.src index db68145cb..91974f66d 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.3.16", - [{load_module,emqx_packet,brutal_purge,soft_purge,[]}, + [{load_module,emqx_ctl,brutal_purge,soft_purge,[]}, + {load_module,emqx_packet,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]}, {load_module,emqx_broker,brutal_purge,soft_purge,[]}, {load_module,emqx_alarm_handler,brutal_purge,soft_purge,[]}, @@ -23,7 +24,8 @@ {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_metrics,brutal_purge,soft_purge,[]}]}, {"4.3.15", - [{load_module,emqx_broker,brutal_purge,soft_purge,[]}, + [{load_module,emqx_ctl,brutal_purge,soft_purge,[]}, + {load_module,emqx_broker,brutal_purge,soft_purge,[]}, {load_module,emqx_topic,brutal_purge,soft_purge,[]}, {load_module,emqx_mqtt_caps,brutal_purge,soft_purge,[]}, {add_module,emqx_exclusive_subscription}, @@ -45,7 +47,8 @@ {update,emqx_os_mon,{advanced,[]}}, {load_module,emqx_app,brutal_purge,soft_purge,[]}]}, {"4.3.14", - [{load_module,emqx_broker,brutal_purge,soft_purge,[]}, + [{load_module,emqx_ctl,brutal_purge,soft_purge,[]}, + {load_module,emqx_broker,brutal_purge,soft_purge,[]}, {load_module,emqx_topic,brutal_purge,soft_purge,[]}, {load_module,emqx_mqtt_caps,brutal_purge,soft_purge,[]}, {add_module,emqx_exclusive_subscription}, @@ -642,7 +645,8 @@ {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], [{"4.3.16", - [{load_module,emqx_packet,brutal_purge,soft_purge,[]}, + [{load_module,emqx_ctl,brutal_purge,soft_purge,[]}, + {load_module,emqx_packet,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]}, {load_module,emqx_broker,brutal_purge,soft_purge,[]}, {load_module,emqx_alarm_handler,brutal_purge,soft_purge,[]}, @@ -663,7 +667,8 @@ {delete_module,emqx_calendar}, {delete_module,emqx_exclusive_subscription}]}, {"4.3.15", - [{load_module,emqx_broker,brutal_purge,soft_purge,[]}, + [{load_module,emqx_ctl,brutal_purge,soft_purge,[]}, + {load_module,emqx_broker,brutal_purge,soft_purge,[]}, {load_module,emqx_topic,brutal_purge,soft_purge,[]}, {load_module,emqx_mqtt_caps,brutal_purge,soft_purge,[]}, {delete_module,emqx_calendar}, @@ -684,7 +689,8 @@ {load_module,emqx_app,brutal_purge,soft_purge,[]}, {delete_module,emqx_exclusive_subscription}]}, {"4.3.14", - [{load_module,emqx_broker,brutal_purge,soft_purge,[]}, + [{load_module,emqx_ctl,brutal_purge,soft_purge,[]}, + {load_module,emqx_broker,brutal_purge,soft_purge,[]}, {load_module,emqx_topic,brutal_purge,soft_purge,[]}, {load_module,emqx_mqtt_caps,brutal_purge,soft_purge,[]}, {delete_module,emqx_calendar},