From 8dd966e8ef18113f9327d5727f3554721f692ee9 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Mon, 8 Aug 2022 16:22:10 +0800 Subject: [PATCH 1/4] fix: enable emqx_mod_module if default_plugins --- src/emqx.app.src | 2 +- src/emqx.appup.src | 16 ++++++++++++++-- src/emqx_plugins.erl | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/emqx.app.src b/src/emqx.app.src index 14a6f4fa4..14c63c75e 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -6,7 +6,7 @@ %% the emqx `release' version, which in turn is comprised of several %% apps, one of which is this. See `emqx_release.hrl' for more %% info. - {vsn, "4.3.19"}, % strict semver, bump manually! + {vsn, "4.3.20"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [ kernel diff --git a/src/emqx.appup.src b/src/emqx.appup.src index c86661891..adc7be0c3 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,13 +1,19 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.3.18",[{load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + [{"4.3.19", + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, + {"4.3.18", + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, {"4.3.17", [{load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]}, {load_module,emqx_session,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {update,emqx_broker_sup,supervisor}, {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_access_control,brutal_purge,soft_purge,[]}]}, {"4.3.16", [{load_module,emqx_session,brutal_purge,soft_purge,[]}, @@ -678,13 +684,19 @@ {load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.3.18",[{load_module,emqx_app,brutal_purge,soft_purge,[]}]}, + [{"4.3.19", + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, + {"4.3.18", + [{load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, {"4.3.17", [{load_module,emqx_exclusive_subscription,brutal_purge,soft_purge,[]}, {load_module,emqx_session,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {update,emqx_broker_sup,supervisor}, {load_module,emqx_app,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_access_control,brutal_purge,soft_purge,[]}]}, {"4.3.16", [{load_module,emqx_session,brutal_purge,soft_purge,[]}, diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl index 3177f05e7..caf47b0c0 100644 --- a/src/emqx_plugins.erl +++ b/src/emqx_plugins.erl @@ -219,7 +219,7 @@ ensure_file(File) -> false -> DefaultPlugins = [ {emqx_management, true} , {emqx_dashboard, true} - , {emqx_modules, false} + , {emqx_modules, true} , {emqx_recon, true} , {emqx_retainer, true} , {emqx_telemetry, true} From 50bb5a4f5ac8f4bc9c8197cce54b67779553df1b Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 9 Aug 2022 09:36:33 +0800 Subject: [PATCH 2/4] fix: emqx version is 4.3.19 --- src/emqx.app.src | 2 +- src/emqx.appup.src | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/emqx.app.src b/src/emqx.app.src index 14c63c75e..14a6f4fa4 100644 --- a/src/emqx.app.src +++ b/src/emqx.app.src @@ -6,7 +6,7 @@ %% the emqx `release' version, which in turn is comprised of several %% apps, one of which is this. See `emqx_release.hrl' for more %% info. - {vsn, "4.3.20"}, % strict semver, bump manually! + {vsn, "4.3.19"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [ kernel diff --git a/src/emqx.appup.src b/src/emqx.appup.src index adc7be0c3..70d18ff48 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,9 +1,7 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.3.19", - [{load_module,emqx_app,brutal_purge,soft_purge,[]}, - {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, + [ {"4.3.18", [{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, @@ -684,9 +682,7 @@ {load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.3.19", - [{load_module,emqx_app,brutal_purge,soft_purge,[]}, - {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, + [ {"4.3.18", [{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, From 25228ed248db60f5d069c02ef5e2ef3cc9ad0c44 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 9 Aug 2022 09:37:05 +0800 Subject: [PATCH 3/4] test: fix compile warning --- apps/emqx_sn/examples/simple_example2.erl | 1 + apps/emqx_sn/examples/simple_example3.erl | 1 + apps/emqx_sn/examples/simple_example4.erl | 2 +- test/emqx_broker_sup_SUITE.erl | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/emqx_sn/examples/simple_example2.erl b/apps/emqx_sn/examples/simple_example2.erl index b9ada6d22..9af9262e9 100644 --- a/apps/emqx_sn/examples/simple_example2.erl +++ b/apps/emqx_sn/examples/simple_example2.erl @@ -6,6 +6,7 @@ -define(PORT, 1884). -export([start/0]). +-export([gen_register_packet/2]). start() -> io:format("start to connect ~p:~p~n", [?HOST, ?PORT]), diff --git a/apps/emqx_sn/examples/simple_example3.erl b/apps/emqx_sn/examples/simple_example3.erl index 40f0bf572..6bc41f1e8 100644 --- a/apps/emqx_sn/examples/simple_example3.erl +++ b/apps/emqx_sn/examples/simple_example3.erl @@ -6,6 +6,7 @@ -define(PORT, 1884). -export([start/0]). +-export([gen_register_packet/2]). start() -> io:format("start to connect ~p:~p~n", [?HOST, ?PORT]), diff --git a/apps/emqx_sn/examples/simple_example4.erl b/apps/emqx_sn/examples/simple_example4.erl index 6beb5835c..1b4809626 100644 --- a/apps/emqx_sn/examples/simple_example4.erl +++ b/apps/emqx_sn/examples/simple_example4.erl @@ -5,7 +5,7 @@ -define(HOST, {127,0,0,1}). -define(PORT, 1884). --export([start/0]). +-export([start/1]). start(LoopTimes) -> io:format("start to connect ~p:~p~n", [?HOST, ?PORT]), diff --git a/test/emqx_broker_sup_SUITE.erl b/test/emqx_broker_sup_SUITE.erl index 04881f308..20bcfbbf6 100644 --- a/test/emqx_broker_sup_SUITE.erl +++ b/test/emqx_broker_sup_SUITE.erl @@ -61,5 +61,5 @@ t_restart_shared_sub(Config) when is_list(Config) -> after 2000 -> false end); -t_restart_shared_sub({'end', Config}) -> +t_restart_shared_sub({'end', _Config}) -> emqx:unsubscribe(<<"$share/grpa/t/a">>). From e9a5c4295c725b26b9858c718b8f10b20ac6a5e5 Mon Sep 17 00:00:00 2001 From: zhongwencool Date: Tue, 9 Aug 2022 10:29:17 +0800 Subject: [PATCH 4/4] fix: bad NeedToLoad plugins --- src/emqx_plugins.erl | 2 +- test/emqx_plugins_SUITE.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl index caf47b0c0..764778b74 100644 --- a/src/emqx_plugins.erl +++ b/src/emqx_plugins.erl @@ -265,7 +265,7 @@ load_plugins(Names, Persistent) -> [] -> ok; NotFound -> ?LOG(alert, "cannot_find_plugins: ~p", [NotFound]) end, - NeedToLoad = Names -- NotFound -- names(started_app), + NeedToLoad = (Names -- NotFound) -- names(started_app), lists:foreach(fun(Name) -> Plugin = find_plugin(Name, Plugins), load_plugin(Plugin#plugin.name, Persistent) diff --git a/test/emqx_plugins_SUITE.erl b/test/emqx_plugins_SUITE.erl index cd4b68d86..66a88a047 100644 --- a/test/emqx_plugins_SUITE.erl +++ b/test/emqx_plugins_SUITE.erl @@ -100,7 +100,7 @@ t_ensure_default_loaded_plugins_file(Config) -> [ {emqx_bridge_mqtt, false} , {emqx_dashboard, true} , {emqx_management, true} - , {emqx_modules, false} + , {emqx_modules, true} , {emqx_recon, true} , {emqx_retainer, true} , {emqx_rule_engine, true}