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

Merge pull request #8179 from Rory-Z/chore/fix-loaded-plugin 

chore: fix when load plugins, update loaded file error
This commit is contained in:
JianBo He 2022-06-14 11:28:59 +08:00 committed by GitHub
parent 3a17fb2522 00fe560dac
commit ffaabe9f6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES-4.3.md
View File

@ -18,8 +18,9 @@ File format:
password-protected private key files used for dashboard and password-protected private key files used for dashboard and
management HTTPS listeners. [#8129] management HTTPS listeners. [#8129]
### Bug-fixes ### Bug fixes
- Avoid repeated writing `loaded_plugins` file if the plugin enable stauts has not changed [#8179]
- Correctly tally `connack.auth_error` metrics when a client uses MQTT - Correctly tally `connack.auth_error` metrics when a client uses MQTT
3.1. [#8177] 3.1. [#8177]

10
src/emqx.appup.src
View File

@ -1,11 +1,14 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!! %% Unless you know what you are doing, DO NOT edit manually!!
{VSN, {VSN,
[{"4.3.16",[{load_module,emqx_metrics,brutal_purge,soft_purge,[]}]}, [{"4.3.16",
[{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_metrics,brutal_purge,soft_purge,[]}]},
{"4.3.15", {"4.3.15",
[{add_module,emqx_calendar}, [{add_module,emqx_calendar},
{load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]}, {load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]},
{load_module,emqx_packet,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_session,brutal_purge,soft_purge,[]},
{load_module,emqx_misc,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]},
{load_module,emqx_shared_sub,brutal_purge,soft_purge,[]}, {load_module,emqx_shared_sub,brutal_purge,soft_purge,[]},
@ -556,11 +559,14 @@
{load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_message,brutal_purge,soft_purge,[]},
{load_module,emqx_limiter,brutal_purge,soft_purge,[]}]}, {load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{"4.3.16",[{load_module,emqx_metrics,brutal_purge,soft_purge,[]}]}, [{"4.3.16",
[{load_module,emqx_plugins,brutal_purge,soft_purge,[]},
{load_module,emqx_metrics,brutal_purge,soft_purge,[]}]},
{"4.3.15", {"4.3.15",
[{delete_module,emqx_calendar}, [{delete_module,emqx_calendar},
{load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]}, {load_module,emqx_logger_textfmt,brutal_purge,soft_purge,[]},
{load_module,emqx_packet,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,brutal_purge,soft_purge,[]},
{load_module,emqx_alarm_handler,brutal_purge,soft_purge,[]}, {load_module,emqx_alarm_handler,brutal_purge,soft_purge,[]},
{load_module,emqx_misc,brutal_purge,soft_purge,[]}, {load_module,emqx_misc,brutal_purge,soft_purge,[]},

3
src/emqx_plugins.erl
View File

@ -387,7 +387,8 @@ plugin_loaded(_Name, false) ->
ok; ok;
plugin_loaded(Name, true) -> plugin_loaded(Name, true) ->
case read_loaded() of case read_loaded() of
{ok, Names} -> {ok, Names0} ->
Names = filter_plugins(Names0),
case lists:member(Name, Names) of case lists:member(Name, Names) of
false -> false ->
%% write file if plugin is loaded %% write file if plugin is loaded