From 9975f3dda8896cb1fd0edc1e8df73c2ad9984bda Mon Sep 17 00:00:00 2001 From: Rory Z Date: Sat, 11 Jun 2022 17:34:22 +0800 Subject: [PATCH 1/3] chore: fix when load plugins, update loaded file error --- src/emqx_plugins.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl index c928d4d31..3177f05e7 100644 --- a/src/emqx_plugins.erl +++ b/src/emqx_plugins.erl @@ -387,7 +387,8 @@ plugin_loaded(_Name, false) -> ok; plugin_loaded(Name, true) -> case read_loaded() of - {ok, Names} -> + {ok, Names0} -> + Names = filter_plugins(Names0), case lists:member(Name, Names) of false -> %% write file if plugin is loaded From 5f75f03be88156cdd68a9b1c35622caffbf5cfd2 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 13 Jun 2022 15:15:01 +0800 Subject: [PATCH 2/3] chore(appup): update emqx.appup.src --- src/emqx.app.src | 2 +- src/emqx.appup.src | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/emqx.app.src b/src/emqx.app.src index c57bd635d..5b5017b1a 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.16"}, % strict semver, bump manually! + {vsn, "4.3.17"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [ kernel diff --git a/src/emqx.appup.src b/src/emqx.appup.src index 844c7fb7a..b72fe98d0 100644 --- a/src/emqx.appup.src +++ b/src/emqx.appup.src @@ -1,10 +1,13 @@ %% -*- mode: erlang -*- %% Unless you know what you are doing, DO NOT edit manually!! {VSN, - [{"4.3.15", + [{"4.3.16", + [{load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, + {"4.3.15", [{add_module,emqx_calendar}, {load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]}, {load_module,emqx_packet,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_session,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, @@ -555,10 +558,13 @@ {load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {<<".*">>,[]}], - [{"4.3.15", + [{"4.3.16", + [{load_module,emqx_plugins,brutal_purge,soft_purge,[]}]}, + {"4.3.15", [{delete_module,emqx_calendar}, {load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]}, {load_module,emqx_packet,brutal_purge,soft_purge,[]}, + {load_module,emqx_plugins,brutal_purge,soft_purge,[]}, {load_module,emqx_alarm,brutal_purge,soft_purge,[]}, {load_module,emqx_alarm_handler,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]}, From 9bf14234526d4b89f769698505778baaa3f8a3a9 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 13 Jun 2022 15:29:22 +0800 Subject: [PATCH 3/3] chore: update changes-4.3.md --- CHANGES-4.3.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES-4.3.md b/CHANGES-4.3.md index 00cb8cf1e..44aa5911a 100644 --- a/CHANGES-4.3.md +++ b/CHANGES-4.3.md @@ -18,6 +18,10 @@ File format: password-protected private key files used for dashboard and management HTTPS listeners. [#8129] +### Bug fixes + +- Avoid repeated writing `loaded_plugins` file if the plugin enable stauts has not changed [#8179] + ## v4.3.15 ### Enhancements