kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-06 12:36:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: Fix handling of restart from remote console.

Browse Source 
We cannot use need_el_end and SIGURG when restarting.  Instead we need
to run el_end within the SIGHUP restartnow handler.

ASTERISK-28158

Change-Id: Ia852276363c81bdcf1aa29eb4558c5c2fa1218a0
This commit is contained in:
Corey Farrell
2018-11-15 06:25:46 -05:00
parent a40b6ad471
commit 013d0c50fb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/asterisk.c
View File

@@ -1791,10 +1791,17 @@ static struct sigaction urg_handler = {
static void _hup_handler(int num) static void _hup_handler(int num)
{ {
int a = 0, save_errno = errno; int a = 0;
printf("Received HUP signal -- Reloading configs\n"); int save_errno = errno;
if (restartnow)
if (restartnow) {
if (el) {
el_end(el);
}
execvp(_argv[0], _argv); execvp(_argv[0], _argv);
}
printf("Received HUP signal -- Reloading configs\n");
sig_flags.need_reload = 1; sig_flags.need_reload = 1;
if (sig_alert_pipe[1] != -1) { if (sig_alert_pipe[1] != -1) {
if (write(sig_alert_pipe[1], &a, sizeof(a)) < 0) { if (write(sig_alert_pipe[1], &a, sizeof(a)) < 0) {
@@ -2137,7 +2144,7 @@ static void really_quit(int num, shutdown_nice_t niceness, int restart)
if (el_hist != NULL) { if (el_hist != NULL) {
history_end(el_hist); history_end(el_hist);
} }
} else { } else if (!restart) {
sig_flags.need_el_end = 1; sig_flags.need_el_end = 1;
pthread_kill(consolethread, SIGURG); pthread_kill(consolethread, SIGURG);
} }