From 963872daa7e4b9623ee187e6a8b3957af72681f2 Mon Sep 17 00:00:00 2001
From: Ivan Poddubny <ivan.poddubny@gmail.com>
Date: Sun, 5 May 2024 14:53:11 +0200
Subject: [PATCH] asterisk.c: Fix sending incorrect messages to systemd notify
Send "RELOADING=1" instead of "RELOAD=1" to follow the format
expected by systemd (see sd_notify(3) man page).
Do not send STOPPING=1 in remote console mode:
attempting to execute "asterisk -rx" by the main process leads to
a warning if NotifyAccess=main (the default) or to a forced termination
if NotifyAccess=all.
(cherry picked from commit 7314a411a9d7b5ecf385747117e330ce40aa2614)
---
main/asterisk.c | 2 +-
main/loader.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/asterisk.c b/main/asterisk.c
index 35ac9fe965..04b030bbfc 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2014,7 +2014,7 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart)
run_cleanups = 0;
}
- if (!restart) {
+ if (!restart && !ast_opt_remote) {
ast_sd_notify("STOPPING=1");
}
if (ast_opt_console || (ast_opt_remote && !ast_opt_exec)) {
diff --git a/main/loader.c b/main/loader.c
index 4c1b59d067..9b97590806 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -1578,7 +1578,7 @@ enum ast_module_reload_result ast_module_reload(const char *name)
res = AST_MODULE_RELOAD_IN_PROGRESS;
goto module_reload_exit;
}
- ast_sd_notify("RELOAD=1");
+ ast_sd_notify("RELOADING=1");
ast_lastreloadtime = ast_tvnow();
if (ast_opt_lock_confdir) {
--
GitLab