chore: sync emqx_relup to ce
This commit is contained in:
parent
d25b614a93
commit
6f575aedd9
|
@ -2,7 +2,8 @@
|
|||
%% Unless you know what you are doing, DO NOT edit manually!!
|
||||
{VSN,
|
||||
[{"4.4.10",
|
||||
[{load_module,emqx_hooks,brutal_purge,soft_purge,[]},
|
||||
[{load_module,emqx_relup,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_hooks,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_misc,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
||||
|
@ -287,7 +288,8 @@
|
|||
{load_module,emqx_limiter,brutal_purge,soft_purge,[]}]},
|
||||
{<<".*">>,[]}],
|
||||
[{"4.4.10",
|
||||
[{load_module,emqx_hooks,brutal_purge,soft_purge,[]},
|
||||
[{load_module,emqx_relup,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_hooks,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_misc,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_channel,brutal_purge,soft_purge,[]},
|
||||
{load_module,emqx_connection,brutal_purge,soft_purge,[]},
|
||||
|
|
|
@ -46,11 +46,30 @@ reload_components() ->
|
|||
?INFO("reloading module providers ..."),
|
||||
emqx_modules:load_providers(),
|
||||
?INFO("loading plugins ..."),
|
||||
emqx_plugins:load().
|
||||
_ = load_plugins(),
|
||||
%% upgrade from e4.3.0~4.3.4 to >=4.3.5 requires persistent default modules after upgrade.
|
||||
%% because the emqx_modules' env is lost when pre_upgrade.
|
||||
%% must after emqx_modules plugin load(for loading emqx_modules' env)
|
||||
case erlang:function_exported(emqx_modules, persistent_default_modules, 0) of
|
||||
true ->
|
||||
?INFO("persistent default modules ..."),
|
||||
emqx_modules:persistent_default_modules();
|
||||
false -> ok
|
||||
end,
|
||||
ok.
|
||||
|
||||
-else.
|
||||
reload_components() ->
|
||||
?INFO("reloading resource providers ..."),
|
||||
emqx_rule_engine:load_providers(),
|
||||
?INFO("loading plugins ..."),
|
||||
emqx_plugins:load().
|
||||
load_plugins(),
|
||||
ok.
|
||||
|
||||
-endif.
|
||||
|
||||
load_plugins() ->
|
||||
case erlang:function_exported(emqx_plugins, force_load, 0) of
|
||||
true -> emqx_plugins:force_load();
|
||||
false -> emqx_plugins:load()
|
||||
end.
|
||||
|
|
Loading…
Reference in New Issue