From: Ivan Poddubny <ivan.poddubny@gmail.com>
Date: Sun, 5 May 2024 12:53:11 +0000 (+0200)
Subject: asterisk.c: Fix sending incorrect messages to systemd notify
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=d7e638f2c37149f2d7040b8ee0575fc22f7f5d58;p=thirdparty%2Fasterisk.git

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.
---

diff --git a/main/asterisk.c b/main/asterisk.c
index 0d306fdeeb..0f7b9f7e7c 100644
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@ -2050,7 +2050,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 ecad2346e1..3ba9737de4 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -1583,7 +1583,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) {