summaryrefslogtreecommitdiff
path: root/src/bin/evas/evas_cserve2_main_loop_linux.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2013-10-11 12:07:43 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2013-10-28 15:47:16 +0900
commit745b4d4acc64432b5b531054b94592bee6d55340 (patch)
treee3a35c0845d130ac7eefeca4e19d656900c214db /src/bin/evas/evas_cserve2_main_loop_linux.c
parentcd702b3785059f99d362045429280a6a9dbc64ff (diff)
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)
Diffstat (limited to 'src/bin/evas/evas_cserve2_main_loop_linux.c')
-rw-r--r--src/bin/evas/evas_cserve2_main_loop_linux.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/bin/evas/evas_cserve2_main_loop_linux.c b/src/bin/evas/evas_cserve2_main_loop_linux.c
index 18b4662e79..7f176184ee 100644
--- a/src/bin/evas/evas_cserve2_main_loop_linux.c
+++ b/src/bin/evas/evas_cserve2_main_loop_linux.c
@@ -131,8 +131,6 @@ _signalfd_handler(int fd, Fd_Flags flags EINA_UNUSED, void *data EINA_UNUSED)
131 _signal_handle_child(&sinfo); 131 _signal_handle_child(&sinfo);
132 break; 132 break;
133 case SIGINT: 133 case SIGINT:
134 case SIGTERM:
135 case SIGQUIT:
136 _signal_handle_exit(&sinfo); 134 _signal_handle_exit(&sinfo);
137 break; 135 break;
138 case SIGUSR1: 136 case SIGUSR1:
@@ -161,10 +159,8 @@ _signalfd_setup(void)
161 159
162 sigemptyset(&mask); 160 sigemptyset(&mask);
163 sigaddset(&mask, SIGCHLD); 161 sigaddset(&mask, SIGCHLD);
164 sigaddset(&mask, SIGTERM); 162 sigaddset(&mask, SIGUSR1); // ignored
165 sigaddset(&mask, SIGQUIT); 163 sigaddset(&mask, SIGUSR2); // ignored
166 sigaddset(&mask, SIGUSR1);
167 sigaddset(&mask, SIGUSR2);
168 164
169 if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) 165 if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1)
170 { 166 {