Add signal handling and clean exiting

include/conf.h

@@ -117,6 +117,12 @@ typedef struct pyfcgi_context_s pyfcgi_context_t;
 struct pyfcgi_context_s {
 	pid_t pid;
 	pid_t ppid;
+
+
+	/**@brief array of worker pids (pool handler context) */
+	pid_t **wrk_pids;
+	/**@brief workers count */
+	unsigned int n_wrk;
 };
 
 /**@brief Structure containing configuration
@@ -148,6 +154,7 @@ struct pyfcgi_conf_s
 	 * @ingroup conf_glob */
 	int max_reqs;
 
+
 	/**@brief Logger configuration
 	 * @ingroupe conf_glob */
 	pyfcgi_conf_logger_t logs;

include/pyworker.h

@@ -73,6 +73,7 @@
 #include <limits.h>
 #include <poll.h>
 #include <sched.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/ipc.h>
 #include <sys/sem.h>
@@ -156,5 +157,7 @@ void worker_piper_sighandler(int);
  */
 int ctl_get_rep_sz(int, size_t*);
 
+void worker_sighandler(int);
+
 #endif
 

include/responder.h

@@ -98,4 +98,7 @@ int new_semaphore();
  */
 void clean_exit(int);
 
+/**@brief Handle signals and forward it to workers */
+void pool_sighandler(int signum);
+
 #endif

src/main.c

@@ -36,6 +36,7 @@
 #include <syslog.h>
 #include <string.h>
 #include <errno.h>
+#include <signal.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 
@@ -50,12 +51,52 @@
 
 extern pyfcgi_conf_t PyFCGI_conf;
 
+pid_t pool_handler_pid;
+
+void sighandler(int signum)
+{
+	int ret;
+	if(signum == SIGINT)
+	{
+		pyfcgi_log(LOG_INFO,
+			"Master process received ctrl+c, exiting...");
+	}
+	else
+	{
+		pyfcgi_log(LOG_INFO,
+			"Master process received signal %s(%d), exiting...",
+			strsignal(signum), signum);
+	}
+	if(pool_handler_pid)
+	{
+		kill(pool_handler_pid, SIGTERM);
+		waitpid(pool_handler_pid, &ret, 0);
+	}
+	pyfcgi_log(LOG_INFO,
+		"Master process exiting.");
+	exit(0);
+}
+
 int main(int argc, char **argv)
 {
-	pid_t child;
 	int child_ret;
 	unsigned int emerg_sleep = 3;
+	struct sigaction act;
+
+	act.sa_handler = sighandler;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGTERM);
+	act.sa_flags = 0;
+	act.sa_restorer = NULL;
+
+	if(sigaction(SIGINT, &act, NULL))
+	{
+		perror("Sigaction error");
+		exit(4);
+	}
+
 
+	pool_handler_pid = 0;
 	default_conf();
 	pyfcgi_logger_init();
 	pyfcgi_logger_set_ident("pyfcgi(main)");
@@ -68,20 +109,21 @@ int main(int argc, char **argv)
 
 	while(1)
 	{
-		child = fork();
-		if(child == -1)
+		pool_handler_pid = fork();
+		if(pool_handler_pid == -1)
 		{
 			// TODO : Error
 			pyfcgi_log(LOG_EMERG, "Failed to fork : '%s' sleeping %ds", strerror(errno), emerg_sleep);
 			sleep(emerg_sleep);
 			continue;
 		}
-		else if(!child)
+		else if(!pool_handler_pid)
 		{
 			responder_loop();
 			exit((unsigned char)-1);
 		}
-		waitpid(child, &child_ret, 0);
+		waitpid(pool_handler_pid, &child_ret, 0);
+		pool_handler_pid = 0;
 		if(child_ret)
 		{
 			pyfcgi_log(LOG_ERR, "Responder loop function exits with error code '%d'",

src/pyworker.c

@@ -551,3 +551,8 @@ static void worker_set_busy(int semid)
 	}
 }
 
+void worker_sighandler(int signum)
+{
+	pyfcgi_log(LOG_INFO, "%s signal received, exiting...", strsignal(signum));
+	exit(0);
+}

src/responder.c

@@ -24,7 +24,6 @@ void init_context()
 	pyfcgi_semid = 0;
 }
 
-
 int responder_loop()
 {
 	unsigned int n_wrk, wanted_n, n;
@@ -35,6 +34,19 @@ int responder_loop()
 	struct sembuf sop;
 	struct timespec timeout;
 	short idle;
+	struct sigaction act;
+
+	act.sa_handler = pool_sighandler;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGTERM);
+	act.sa_flags = 0;
+	act.sa_restorer = NULL;
+
+	if(sigaction(SIGINT, &act, NULL))
+	{
+		perror("Sigaction error for pool process");
+		exit(PYFCGI_FATAL);
+	}
 
 	sop.sem_num = 0;
 	sop.sem_op = 0;
@@ -48,6 +60,8 @@ int responder_loop()
 
 	init_context();
 
+	PyFCGI_conf.context.wrk_pids = &wrk_pids;
+	PyFCGI_conf.context.n_wrk = 0;
 	wrk_pids = malloc(sizeof(int) * PyFCGI_conf.max_wrk);
 	if(!wrk_pids)
 	{
@@ -67,6 +81,7 @@ int responder_loop()
 	for(n_wrk=0; n_wrk < wanted_n; n_wrk++)
 	{
 		wrk_pids[n_wrk] = spawn(n_wrk, semid);
+		PyFCGI_conf.context.n_wrk = n_wrk;
 	}
 	//Wait at least for a process to be ready
 	while(!semtimedop(semid, &sop, 1, &timeout));
@@ -75,6 +90,7 @@ int responder_loop()
 	// spawn new one if needed, etc.
 	while(1)
 	{
+		PyFCGI_conf.context.n_wrk = n_wrk;
 		if( (ret = waitpid(0, &status, WNOHANG)) )
 		{
 			if(ret < 0)
@@ -200,11 +216,12 @@ pyfcgi_log( LOG_DEBUG, "GC want %d have %d", wanted_n, n_wrk);
 	}
 	
 	//Debug wait & exit
-	for(n_wrk=0; n_wrk != PyFCGI_conf.min_wrk; n_wrk++)
+	for(; n_wrk != 0; n_wrk--)
 	{
 		waitpid(wrk_pids[n_wrk], &status, 0);
 		pyfcgi_log(LOG_DEBUG, "Child %d stopped with status %d",
 		       wrk_pids[n_wrk], status);
+		PyFCGI_conf.context.n_wrk = n_wrk;
 	}
 		//printf("Content-Type: text/html\r\n\r\nHello world !\n");
 	pyfcgi_log(LOG_INFO,"Child workers stoped, stopping responder");
@@ -215,9 +232,17 @@ pid_t spawn(int wrk_id, int semid)
 {
 	pid_t res;
 	struct timespec timeout;
+	struct sigaction act;
+
 	timeout.tv_sec = 0;
 	timeout.tv_nsec = 100000000;
-	
+
+	act.sa_handler = worker_sighandler;
+	sigemptyset(&act.sa_mask);
+	sigaddset(&act.sa_mask, SIGTERM);
+	act.sa_flags = 0;
+	act.sa_restorer = NULL;
+
 
 	res = fork();
 	if(res == -1)
@@ -229,6 +254,12 @@ pid_t spawn(int wrk_id, int semid)
 	else if(!res)
 	{
 		// Child process
+		if(sigaction(SIGINT, &act, NULL))
+		{
+			perror("Sigaction error for pool process");
+			exit(PYFCGI_FATAL);
+		}
+
 		if(PyFCGI_conf.pep333)
 		{
 			exit(work333(wrk_id, semid));
@@ -276,8 +307,38 @@ void clean_exit(int status)
 {
 	if(pyfcgi_semid && semctl(pyfcgi_semid, 0, IPC_RMID) == -1)
 	{
+		/*silentely fails (when exiting from sighandler)
 		pyfcgi_log(	LOG_CRIT,
-			"Unable to delete semaphore before exiting.");
+			"Unable to delete semaphore before exiting : %s",
+			strerror(errno));
+		*/
 	}
 	exit(status);
 }
+
+void pool_sighandler(int signum)
+{
+	unsigned int i;
+	struct timespec req;
+	req.tv_sec = 0;
+	req.tv_nsec = 200000000; //0.2s
+	if(PyFCGI_conf.context.n_wrk < 1) { clean_exit(0); }
+
+	for(i=0; i<PyFCGI_conf.context.n_wrk; i++)
+	{
+		pyfcgi_log(LOG_INFO, "Sending SIGTERM to child #%d (pid %d)",
+			i,(*PyFCGI_conf.context.wrk_pids)[i]);
+		kill((*PyFCGI_conf.context.wrk_pids)[i], SIGTERM);
+		nanosleep(&req, NULL); //waiting 0.2s
+	}
+	for(i=0; i<PyFCGI_conf.context.n_wrk; i++)
+	{
+		if(kill((*PyFCGI_conf.context.wrk_pids)[i], SIGCONT))
+		{
+			pyfcgi_log(LOG_INFO, "Sending SIGKILL to child %d", i);
+			kill((*PyFCGI_conf.context.wrk_pids)[i], SIGKILL);
+		}
+		
+	}
+	clean_exit(0);
+}