retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

Handle signals better with -reincarnate 

If we receive SIGTERM or SIGILL we should propagate the signal to the
child FS process.  As FS normally handles these signals, we need to
restore the handler before we refork.

FS may also add a handler for SIGCHLD; we need the default action
here instead for the parent.
This commit is contained in:
Travis Cross 2013-07-26 03:35:46 +00:00
parent 9fc3990e04
commit 9959096559
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/switch.c
View File

@ -357,11 +357,25 @@ static void daemonize(int *fds)
return;
}
static pid_t reincarnate_child = 0;
static void reincarnate_handle_sigterm (int sig) {
if (!sig) return;
if (reincarnate_child) kill(reincarnate_child, sig);
return;
}
static void reincarnate_protect(char **argv) {
int i;
int i; struct sigaction sa, sa_dfl, sa4_prev, sa15_prev, sa17_prev;
memset(&sa, 0, sizeof(sa)); memset(&sa_dfl, 0, sizeof(sa_dfl));
sa.sa_handler = reincarnate_handle_sigterm;
sa_dfl.sa_handler = SIG_DFL;
refork:
if ((i=fork())) { /* parent */
int s; pid_t r;
reincarnate_child = i;
sigaction(SIGILL, &sa, &sa4_prev);
sigaction(SIGTERM, &sa, &sa15_prev);
sigaction(SIGCHLD, &sa_dfl, &sa17_prev);
rewait:
r = waitpid(i, &s, 0);
if (r == (pid_t)-1) {
@ -375,6 +389,9 @@ static void reincarnate_protect(char **argv) {
exit(WEXITSTATUS(s));
}
if (WIFEXITED(s) || WIFSIGNALED(s)) {
sigaction(SIGILL, &sa4_prev, NULL);
sigaction(SIGTERM, &sa15_prev, NULL);
sigaction(SIGCHLD, &sa17_prev, NULL);
if (argv) {
execv(argv[0], argv); return;
} else goto refork;