kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-02-09 01:06:00 +00:00
Code Issues Projects Releases Wiki Activity

FS-11449: [core] add -elegant-term command line option to make SIGTERM perform an elegant shutdown

Browse Source
This commit is contained in:
Mike Jerris 2018-10-11 02:14:24 +00:00 committed by Andrey Volk
parent f4d8631c09
commit abec4deaa1
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/switch.c
View File

@ -90,6 +90,15 @@ static void handle_SIGILL(int sig)
return; return;
} }
static void handle_SIGTERM(int sig)
{
int32_t arg = 0;
if (sig) {};
/* send shutdown signal to the freeswitch core */
switch_core_session_ctl(SCSC_SHUTDOWN_ELEGANT, &arg);
return;
}
/* kill a freeswitch process running in background mode */ /* kill a freeswitch process running in background mode */
static int freeswitch_kill_background() static int freeswitch_kill_background()
{ {
@ -495,6 +504,7 @@ int main(int argc, char *argv[])
switch_bool_t win32_service = SWITCH_FALSE; switch_bool_t win32_service = SWITCH_FALSE;
#endif #endif
switch_bool_t nc = SWITCH_FALSE; /* TRUE if we are running in noconsole mode */ switch_bool_t nc = SWITCH_FALSE; /* TRUE if we are running in noconsole mode */
switch_bool_t elegant_term = SWITCH_FALSE;
pid_t pid = 0; pid_t pid = 0;
int i, x; int i, x;
char *opts; char *opts;
@ -665,6 +675,10 @@ int main(int argc, char *argv[])
nf = SWITCH_TRUE; nf = SWITCH_TRUE;
} }
else if (!strcmp(local_argv[x], "-elegant-term")) {
elegant_term = SWITCH_TRUE;
}
else if (!strcmp(local_argv[x], "-reincarnate")) { else if (!strcmp(local_argv[x], "-reincarnate")) {
reincarnate = SWITCH_TRUE; reincarnate = SWITCH_TRUE;
} }
@ -1065,7 +1079,12 @@ int main(int argc, char *argv[])
#endif #endif
#endif #endif
signal(SIGILL, handle_SIGILL); signal(SIGILL, handle_SIGILL);
signal(SIGTERM, handle_SIGILL); if (elegant_term) {
signal(SIGTERM, handle_SIGTERM);
} else {
signal(SIGTERM, handle_SIGILL);
}
#ifndef WIN32 #ifndef WIN32
if (do_wait) { if (do_wait) {
if (pipe(fds)) { if (pipe(fds)) {