Add sighandler for monitor server

include/monitor.h

@@ -101,4 +101,6 @@ int pyfcgi_monitor_parse_sock(const char*, int[3], pyfcgi_monitor_addr_t*);
 int pyfcgi_monitor_parse_inet_addr(const char*, int, pyfcgi_monitor_addr_t*,
 	int*);
 
+void pyfcgi_monitor_sighandler(int signum);
+
 #endif

src/monitor.c

@@ -14,6 +14,16 @@ static void clean_exit(int status)
 pid_t pyfcgi_spawn_monitor()
 {
 	pid_t res;
+	struct sigaction act;
+	const int signums[] = {SIGINT, SIGTERM, SIGALRM, 0};
+	const int *signum;
+	int err;
+
+	signum = signums;
+	act.sa_handler = pyfcgi_monitor_sighandler;
+	sigemptyset(&act.sa_mask);
+	act.sa_flags = 0;
+	act.sa_restorer = NULL;
 
 	if(!PyFCGI_conf.mon_socket)
 	{
@@ -33,6 +43,17 @@ pid_t pyfcgi_spawn_monitor()
 	if(!res)
 	{ //child process
 		pyfcgi_logger_set_ident("StatServ");
+		while(*signum)
+		{
+			if(sigaction(*signum, &act, NULL))
+			{
+				err = errno;
+				pyfcgi_log(LOG_ERR, "Unable to run sigaction for %s : %s",
+					strsignal(*signum), strerror(err));
+				exit(PYFCGI_FATAL);
+			}
+			signum++;
+		}
 		pyfcgi_monitor_loop();
 		pyfcgi_log(LOG_ALERT, "Monitor loop should never return but just did it...");
 		clean_exit(PYFCGI_FATAL);
@@ -331,3 +352,10 @@ free_err:
 	return -1;
 }
 
+void pyfcgi_monitor_sighandler(int signum)
+{
+	pyfcgi_log(LOG_NOTICE, "Received signal %s, exiting",
+		strsignal(signum));
+	clean_exit(0);
+}
+