kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

evas/cserve2: catch only SIGINT from cserve2 

SIGTERM and SIGQUIT don't need to be caught.
the proper signal to ask cserve2 to exit cleanly is SIGINT.

enlightenment_start (or systemd) should be responsible for
restarting in case of crash / unexpected termination.

cserve2 will not restart if killed with signal SIGINT,
as it will then exit with return code 0 (normal)
This commit is contained in:
Jean-Philippe Andre 2013-10-11 12:07:43 +09:00
parent cd702b3785
commit 745b4d4acc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/bin/evas/evas_cserve2_main_loop_linux.c
View File

@ -131,8 +131,6 @@ _signalfd_handler(int fd, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED)
_signal_handle_child(&sinfo); _signal_handle_child(&sinfo);
break; break;
case SIGINT: case SIGINT:
case SIGTERM:
case SIGQUIT:
_signal_handle_exit(&sinfo); _signal_handle_exit(&sinfo);
break; break;
case SIGUSR1: case SIGUSR1:
@ -161,10 +159,8 @@ _signalfd_setup(void)
sigemptyset(&mask); sigemptyset(&mask);
sigaddset(&mask, SIGCHLD); sigaddset(&mask, SIGCHLD);
sigaddset(&mask, SIGTERM); sigaddset(&mask, SIGUSR1); // ignored
sigaddset(&mask, SIGQUIT); sigaddset(&mask, SIGUSR2); // ignored
sigaddset(&mask, SIGUSR1);
sigaddset(&mask, SIGUSR2);
if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1)
{ {