Code cleaning & better worker exit status detection

And better handling of entrypoint import failure...

src/main.c

@@ -56,17 +56,6 @@ int main(int argc, char **argv)
 	int child_ret;
 	unsigned int emerg_sleep = 3;
 
-	/*
-	if(argc > 1 || !py_entrypoint)
-	{
-		usage();
-		return 1;
-		EARLY_ERR("Usage : PY_ENTRYPOINT='PATH.py' spawn-fcgi [OPTIONS] ");
-		EARLY_ERR(argv[0]);
-		EARLY_ERR("\n");
-		return 1;
-	}
-	*/
 	default_conf();
 	pyfcgi_logger_init();
 	pyfcgi_logger_set_ident("pyfcgi(main)");
@@ -75,25 +64,6 @@ int main(int argc, char **argv)
 		return 1;
 	}
 
-
-	//pyfcgi_logger_add("/tmp/pyfcgi.log", 0xFF, 0xFF, NULL);
-
-	/*
-	cahr *ident;
-	size_t ident_len;
-	ident_len = snprintf(NULL, 0, IDENT_FMT, getpid());
-	ident_len++;
-	ident = malloc(sizeof(char)*ident_len);
-	if(ident == NULL)
-	{
-		EARLY_ERR("Unable to allocate memory for ident string...\n");
-		return -1;
-	}
-	snprintf(ident, ident_len, IDENT_FMT, getpid());
-	pyfcgi_logger_enable_syslog(ident);
-	free(ident);
-	*/
-
 	pyfcgi_log(LOG_INFO, "New server started");
 
 	while(1)
@@ -135,7 +105,7 @@ int main(int argc, char **argv)
  * @section main_what What is PyFCGI ?
  * PyFCGI is a simple python3 fastcgi runner.
  *
- * Usage : *PY_ENTRYPOINT='foo' spawn-fcgi -d . -n src/pyfcgi -p 9000 -a 127.0.0.1*
+ * Usage : Usage : spawn-fcgi [OPTIONS] -- pyfcgi -e PYMODULE [-E PYFUN] [OPTIONS]
  *
  * To run foo.entrypoint() python function.
  *
@@ -147,9 +117,8 @@ int main(int argc, char **argv)
  * PyFCGI should be runned with spawn-fcgi (or something similar), allowing
  * to configure & forward environnement variables to libFCGI.
  *
- * For the moment no configuration files exists. You have to pass a 
- * PY_ENTRYPOINT containing an importable python module containing an
- * entrypoint() (no arguments for the moment) function.
+ * For the moment no configuration files exists. You have to pass arguments
+ * to pyfcgi using -- argument of spawnn-fcgi
  *
  * When called this function will have to send valid CGI data to the webserver
  * using sys.stdin (the print() function for exemple) like :

src/pyworker.c

@@ -106,6 +106,13 @@ int work(int wrk_id, int semid)
 		       wrk_id, strerror(err));
 	}
 
+	if(!entry_fun) //but exit if import failed
+	{
+		pyfcgi_log(LOG_ALERT, "Unable to import entrypoint");
+		exit(PYFCGI_FATAL);
+
+	}
+
 	if(pipe(pipe_ctl) == -1)
 	{
 		err = errno;
@@ -130,18 +137,9 @@ int work(int wrk_id, int semid)
 		}
 
 		count++;
-		/*
-		pyfcgi_log(	LOG_INFO,
-			"Worker[%d] request %d", wrk_id, count);
-		*/
 		piper_args.out = out_stream;
 		//piper_args.req_id = count;
 		worker_piper_sigrcv = 0;
-		/*
-		pid_t pid = fork();
-		if(!pid) { exit(worker_piper(&piper_args)); }
-		*/
-
 
 		pid_t pid = clone(worker_piper, piper_stack + PIPER_STACK_SZ - 1,
 		                  CLONE_CHILD_CLEARTID | CLONE_CHILD_SETTID | \
@@ -156,16 +154,6 @@ int work(int wrk_id, int semid)
 			       wrk_id, count, strerror(err));
 			exit(err);
 		}
-		/*
-		if(!pid)
-		{
-			
-			worker_piper(wrk_id, count, pipe_out[0], pipe_err[0],
-			             pipe_ctl[1], out_stream);
-			//printf("Content-type: text/html\r\n\r\nHello world !\n");
-			exit(1);
-		}
-		*/
 		update_pyenv(py_osmod, envp);
 		//close(pipe_ctl[1]);
 		PyObject_CallObject(entry_fun, NULL);
@@ -463,7 +451,7 @@ PyObject* import_entrypoint()
 			"%s", getcwd(NULL, 256));
 		log_expt(LOG_ERR);
 		sleep(1);
-		Py_Exit(1);
+		return NULL;
 	}
 
 	// getting entrypoint function
@@ -476,14 +464,14 @@ PyObject* import_entrypoint()
 		pyfcgi_log(	LOG_CRIT,
 			"Unable to import object '%s' from '%s'",
 			PyFCGI_conf.py_entryfun, PyFCGI_conf.py_entrymod);
-		Py_Exit(2);
+		return NULL;
 	}
 	if(!PyCallable_Check(entry_fun))
 	{
 		pyfcgi_log( LOG_CRIT,
 			"When imported from '%s', '%s' was not a callable",
 			PyFCGI_conf.py_entrymod, PyFCGI_conf.py_entryfun);
-		Py_Exit(3);
+		return NULL;
 	}
 	return entry_fun;
 }

src/responder.c

@@ -112,9 +112,19 @@ int responder_loop()
 			}
 			if(status)
 			{
-				pyfcgi_log(LOG_WARNING,
-				       "Worker[%d] exited with status %d",
-				       n, status);
+				if(WEXITSTATUS(status) & PYFCGI_FATAL)
+				{
+					pyfcgi_log(LOG_ALERT,
+						"Worker[%d] exited with status FATAL",
+						n);
+					//TODO : restart ?
+				}
+				else
+				{
+					pyfcgi_log(LOG_WARNING,
+						"Worker[%d] exited with status %d",
+						n, WEXITSTATUS(status));
+				}
 			}
 			else
 			{