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

Merge pull request #8801 from zhongwencool/improve-warning-default-modules 

chore: warning default modules/plugins is working
This commit is contained in:
zhongwencool 2022-08-25 14:27:58 +08:00 committed by GitHub
parent c20c045812 b732aa5aa2
commit 074e25f433
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-ce/emqx_modules/src/emqx_modules.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_modules,
[{description, "EMQ X Module Management"},
{vsn, "4.3.8"},
{vsn, "4.3.9"},
{modules, []},
{applications, [kernel,stdlib]},
{mod, {emqx_modules_app, []}},

18
lib-ce/emqx_modules/src/emqx_modules.appup.src
View File

@ -1,11 +1,10 @@
%% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!!
{VSN,
[{"4.3.7",[{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
{"4.3.6",[{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
{"4.3.5",
[{load_module,emqx_modules,brutal_purge,soft_purge,[]},
{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
[{"4.3.8",[{load_module,emqx_modules,brutal_purge,soft_purge,[]}]},
{<<"4\\.3\\.[5-7]">>,
[{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]},
{load_module,emqx_modules,brutal_purge,soft_purge,[]}]},
{"4.3.4",
[{load_module,emqx_modules,brutal_purge,soft_purge,[]},
{load_module,emqx_mod_subscription,brutal_purge,soft_purge,[]},
@ -32,11 +31,10 @@
{load_module,emqx_mod_api_topic_metrics,brutal_purge,soft_purge,[]},
{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}],
[{"4.3.7",[{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
{"4.3.6",[{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
{"4.3.5",
[{load_module,emqx_modules,brutal_purge,soft_purge,[]},
{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]}]},
[{"4.3.8",[{load_module,emqx_modules,brutal_purge,soft_purge,[]}]},
{<<"4\\.3\\.[5-7]">>,
[{load_module,emqx_mod_rewrite,brutal_purge,soft_purge,[]},
{load_module,emqx_modules,brutal_purge,soft_purge,[]}]},
{"4.3.4",
[{load_module,emqx_modules,brutal_purge,soft_purge,[]},
{load_module,emqx_mod_subscription,brutal_purge,soft_purge,[]},

7
lib-ce/emqx_modules/src/emqx_modules.erl
View File

@ -62,12 +62,13 @@ load(ModuleName) ->
%% @doc Creates a `loaded_modules' file with default values if one
%% doesn't exist.
-spec ensure_loaded_modules_file(file:filename()) -> ok.
ensure_loaded_modules_file(Filepath) ->
case filelib:is_regular(Filepath) of
ensure_loaded_modules_file(FilePath) ->
case filelib:is_regular(FilePath) of
true ->
ok;
false ->
do_ensure_loaded_modules_file(Filepath)
?LOG(warning, "~s is not found, use the default modules instead", [FilePath]),
do_ensure_loaded_modules_file(FilePath)
end.
do_ensure_loaded_modules_file(Filepath) ->

1
src/emqx_plugins.erl
View File

@ -218,6 +218,7 @@ ensure_file(File) ->
case filelib:is_file(File) of
false ->
DefaultPlugins = default_plugins(),
?LOG(warning, "~s is not found, use the default plugins instead", [File]),
write_loaded(DefaultPlugins);
true ->
ok