chore: rename on_xxx_hooks to on_xxx

This commit is contained in:
zhongwencool 2022-09-14 10:22:03 +08:00
parent 362c176d24
commit c2f1f1aab8
2 changed files with 8 additions and 13 deletions

View File

@ -28,13 +28,8 @@
{load_module,emqx_channel,brutal_purge,soft_purge,[]}, {load_module,emqx_channel,brutal_purge,soft_purge,[]},
{load_module,emqx_app,brutal_purge,soft_purge,[]}, {load_module,emqx_app,brutal_purge,soft_purge,[]},
{load_module,emqx_message,brutal_purge,soft_purge,[]}, {load_module,emqx_message,brutal_purge,soft_purge,[]},
<<<<<<< HEAD
{load_module,emqx_cm,brutal_purge,soft_purge,[]}, {load_module,emqx_cm,brutal_purge,soft_purge,[]},
{load_module,emqx,brutal_purge,soft_purge,[]}]}, {load_module,emqx,brutal_purge,soft_purge,[]}]},
=======
{load_module,emqx,brutal_purge,soft_purge,[]},
{load_module,emqx_cm,brutal_purge,soft_purge,[]}]},
>>>>>>> 8e5674f14 (chore: update appup.src)
{"4.3.19", {"4.3.19",
[{load_module,emqx_listeners,brutal_purge,soft_purge,[]}, [{load_module,emqx_listeners,brutal_purge,soft_purge,[]},
{load_module,emqx_router_helper,brutal_purge,soft_purge,[]}, {load_module,emqx_router_helper,brutal_purge,soft_purge,[]},

View File

@ -228,7 +228,7 @@ shutdown() ->
shutdown(Reason) -> shutdown(Reason) ->
?LOG(critical, "emqx shutdown for ~s", [Reason]), ?LOG(critical, "emqx shutdown for ~s", [Reason]),
on_shutdown_hook(Reason), on_shutdown(Reason),
_ = emqx_plugins:unload(), _ = emqx_plugins:unload(),
lists:foreach(fun application:stop/1 lists:foreach(fun application:stop/1
, lists:reverse(default_started_applications()) , lists:reverse(default_started_applications())
@ -240,11 +240,11 @@ reboot() ->
_ = application:stop(emqx_dashboard), %% dashboard must be started after mnesia _ = application:stop(emqx_dashboard), %% dashboard must be started after mnesia
lists:foreach(fun application:start/1 , default_started_applications()), lists:foreach(fun application:start/1 , default_started_applications()),
_ = application:start(emqx_dashboard), _ = application:start(emqx_dashboard),
on_reboot_hooks(); on_reboot();
false -> false ->
lists:foreach(fun application:start/1 , default_started_applications()), lists:foreach(fun application:start/1 , default_started_applications()),
on_reboot_hooks() on_reboot()
end. end.
is_application_running(App) -> is_application_running(App) ->
@ -260,7 +260,7 @@ default_started_applications() ->
-endif. -endif.
-ifdef(EMQX_ENTERPRISE). -ifdef(EMQX_ENTERPRISE).
on_reboot_hooks() -> on_reboot() ->
try try
_ = emqx_license_api:bootstrap_license(), _ = emqx_license_api:bootstrap_license(),
ok ok
@ -271,17 +271,17 @@ on_reboot_hooks() ->
end, end,
ok. ok.
on_shutdown_hook(join) -> on_shutdown(join) ->
emqx_modules:sync_load_modules_file(), emqx_modules:sync_load_modules_file(),
ok; ok;
on_shutdown_hook(_) -> on_shutdown(_) ->
ok. ok.
-else. -else.
on_reboot_hooks() -> on_reboot() ->
ok. ok.
on_shutdown_hook(_) -> on_shutdown(_) ->
ok. ok.
-endif. -endif.