diff --git a/lib-ce/emqx_modules/src/emqx_modules.app.src b/lib-ce/emqx_modules/src/emqx_modules.app.src index 9db13dbc8..055e4c780 100644 --- a/lib-ce/emqx_modules/src/emqx_modules.app.src +++ b/lib-ce/emqx_modules/src/emqx_modules.app.src @@ -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, []}}, diff --git a/lib-ce/emqx_modules/src/emqx_modules.appup.src b/lib-ce/emqx_modules/src/emqx_modules.appup.src index 5b8fb4434..e4a41be8c 100644 --- a/lib-ce/emqx_modules/src/emqx_modules.appup.src +++ b/lib-ce/emqx_modules/src/emqx_modules.appup.src @@ -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,[]}, diff --git a/lib-ce/emqx_modules/src/emqx_modules.erl b/lib-ce/emqx_modules/src/emqx_modules.erl index 7f9b44868..514d9024a 100644 --- a/lib-ce/emqx_modules/src/emqx_modules.erl +++ b/lib-ce/emqx_modules/src/emqx_modules.erl @@ -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) -> diff --git a/src/emqx_plugins.erl b/src/emqx_plugins.erl index 39fe41904..ca103520d 100644 --- a/src/emqx_plugins.erl +++ b/src/emqx_plugins.erl @@ -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