kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

asterisk.c: Fix sending incorrect messages to systemd notify

Browse Source 
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 d7e638f2c3)
This commit is contained in:
Ivan Poddubny
2024-05-05 14:53:11 +02:00
committed by Asterisk Development Team
parent 60c3f0273c
commit f5107404c5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/asterisk.c
View File

@@ -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)) {

2
main/loader.c
View File

@@ -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) {