diff options
| author | Jean-Sébastien Pédron <jean-sebastien@rabbitmq.com> | 2021-08-10 15:34:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-10 15:34:32 +0200 |
| commit | b81e46f0492418dc9e47da0870366265bd878bfb (patch) | |
| tree | c934f5c66806261f8d13c8522bbfb031ec45218e | |
| parent | 6cf22b1d28d373ff8d0231a6f20b528a0d2eb5e9 (diff) | |
| parent | 51cfa4eb9689d489a11bcfff8a0812c590eca01a (diff) | |
| download | rabbitmq-server-git-b81e46f0492418dc9e47da0870366265bd878bfb.tar.gz | |
Merge pull request #3280 from rabbitmq/do-not-report-stopping-state-to-systemd
Do not report stopping state to systemd
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state.erl | 6 | ||||
| -rw-r--r-- | deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state.erl index dd4a29ca6d..1932c5f6b3 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state.erl @@ -21,7 +21,11 @@ -define(PT_KEY_BOOT_STATE, {?MODULE, boot_state}). --type boot_state() :: 'stopped' | 'booting' | 'core_started' | 'ready' | 'stopping'. +-type boot_state() :: stopped | + booting | + core_started | + ready | + stopping. -export_type([boot_state/0]). diff --git a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl index 5627a65daa..40cd1ec804 100644 --- a/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl +++ b/deps/rabbit/apps/rabbitmq_prelaunch/src/rabbit_boot_state_systemd.erl @@ -45,8 +45,7 @@ code_change(_OldVsn, State, _Extra) -> %% Private -notify_boot_state(BootState) - when BootState =:= ready orelse BootState =:= stopping -> +notify_boot_state(ready = BootState) -> Status = boot_state_to_desc(BootState), ?LOG_DEBUG( ?LOG_PREFIX "notifying of state `~s`", @@ -56,13 +55,14 @@ notify_boot_state(BootState) notify_boot_state(BootState) -> Status = boot_state_to_desc(BootState), ?LOG_DEBUG( - ?LOG_PREFIX "sending non-systemd state (~s) as status description: ~s", + ?LOG_PREFIX "sending non-systemd state (~s) as status description: " + "\"~s\"", [BootState, Status], #{domain => ?RMQLOG_DOMAIN_PRELAUNCH}), systemd:notify({status, Status}). boot_state_to_desc(stopped) -> - ""; + "Standing by"; boot_state_to_desc(booting) -> "Startup in progress"; boot_state_to_desc(core_started) -> |