Add two options + status2str function

Add a -t --timeout and a -f --fast-spawn option for further commit

include/conf.h

@@ -44,7 +44,11 @@
 
 /**@defgroup ret_status Function & process return status
  */
+/**@ingroup ret_status */
+#define EXIT_PYERR 4
+/**@ingroup ret_status */
 #define PYFCGI_TIMEOUT 8
+/**@ingroup ret_status */
 #define PYFCGI_ERR 16
 /**@ingroup ret_status */
 #define PYFCGI_WORKER_FAIL 32
@@ -53,11 +57,9 @@
 /**@ingroup ret_status */
 #define PYFCGI_FATAL 128
 
-#define EXIT_PYERR 42
-
 #define PYFCGI_NAME "spawn-fcgi [OPTIONS] -- pyfcgi"
 
-#define PYFCGI_SHORT_OPT "Ce:E:Aw:W:m:L:SvVh"
+#define PYFCGI_SHORT_OPT "Ce:E:Aw:W:m:ft:L:SvVh"
 
 #define PYFCGI_LONG_OPT { \
 	{"config", required_argument, 0, 'C'},\
@@ -67,6 +69,8 @@
 	{"min-worker", required_argument, 0, 'w'},\
 	{"max-worker", required_argument, 0, 'W'},\
 	{"max-request", required_argument, 0, 'm'},\
+	{"fast-spawn", no_argument, 0, 'f'},\
+	{"timeout", required_argument, 0, 't'},\
 	{"log", required_argument, 0, 'L'},\
 	{"syslog", no_argument, 0, 'S'},\
 	{"pid-file", required_argument, 0, 'P'},\
@@ -84,6 +88,8 @@
 	{"Minimum worker in the pool", "INT"},\
 	{"Maximum worker in the pool", "INT"},\
 	{"Request count after wich the worker is restarted (if 0 never restart)", "INT"},\
+	{"If not given there is at least 1s between 2 child creation, else childs may be spawned in small burst", NULL},\
+	{"Request timeout (before worker restarts)", "SECONDS"},\
 	{"Add a logfile using syntax : 'LOGFILE[;FILT][;FMT]'", "LOGGER_SPEC"},\
 	{"Use syslog for logging", NULL},\
 	{"Create a PID file", "FILENAME"},\
@@ -181,15 +187,26 @@ struct pyfcgi_conf_s
 	 * @ingroup conf_glob */
 	int max_reqs;
 
+	//Pool handling conf
+	/**@brief Idle timeout : starts GC workers after Xs idle */
+	time_t worker_gc_timeout;
+	/**@brief Fast spawn : if 1 spawn more childs faster
+	 *
+	 * When not activated there is at least 1s between 2 child creation,
+	 * else child are created in small burst ( ~2 childs burst)
+	 */
+	short worker_fast_spawn;
+
+
+	//watchdogs config
 	/**@brief Worker timeout in seconds (if 0 no timeout)*/
 	time_t worker_timeout;
-
 	/**@brief Pool timeout in seconds (if 0 no timeout)*/
 	time_t pool_timeout;
 
+	// logger config
 	/**@brief 0 is silent 1 means logs to stderr */
 	short verbosity;
-
 	/**@brief Logger configuration
 	 * @ingroupe conf_glob */
 	pyfcgi_conf_logger_t logs;
@@ -233,4 +250,10 @@ int pyfcgi_wd_stop();
 /**@brief Watchdog default signal handler */
 void pyfcgi_wd_default_sighandler(int signum);
 
+/**@brief Return a string representing a status
+ * @param int status
+ * @return a char* that should be freed
+ */
+char *status2str(int);
+
 #endif

src/conf.c

@@ -24,7 +24,7 @@ void usage()
 			default: //no_argument
 				dprintf(2, "\n");
 		}
-		printf("\t\t%s\n\n", help[i][0]);
+		dprintf(2, "\t\t%s\n", help[i][0]);
 		i++;
 	}
 	dprintf(2, "%s", PYFCGI_HELP_TEXT);
@@ -48,6 +48,7 @@ void default_conf()
 	PyFCGI_conf.verbosity = 0;
 	PyFCGI_conf.pool_timeout = 5;
 	PyFCGI_conf.worker_timeout = 3;
+	PyFCGI_conf.worker_gc_timeout = 5;
 }
 
 int parse_args(int argc, char *argv[])
@@ -96,6 +97,16 @@ int parse_args(int argc, char *argv[])
 					PyFCGI_conf.max_reqs = 0;
 				}
 				break;
+			case 'f':
+				PyFCGI_conf.worker_fast_spawn = 1;
+				break;
+			case 't':
+				PyFCGI_conf.worker_timeout = atoi(optarg);
+				if(PyFCGI_conf.worker_timeout < 0)
+				{
+					PyFCGI_conf.worker_timeout = 0;
+				}
+				break;
 			case 'L':
 				if(parse_optlog(optarg))
 				{
@@ -281,7 +292,7 @@ int pyfcgi_wd_arm()
 	}
 
 	timeout.it_value.tv_sec = (time_t)(timeout.it_value.tv_sec * 1.5);
-	timeout.it_value.tv_nsec = (long)(timeout.it_value.tv_nsec * 1.5);
+	timeout.it_value.tv_nsec = 500000000;
 	timeout.it_interval = timeout.it_value;
 
 	if(timer_settime(context->wd_timerkill, 0, &timeout, NULL) < 0)
@@ -368,3 +379,57 @@ void pyfcgi_wd_default_sighandler(int signum)
 	exit(PYFCGI_TIMEOUT);
 }
 
+char *status2str(int status)
+{
+	char buff[1024], *buffptr;
+	size_t left = 1024, ret;
+	short reason;
+
+	reason = 0;
+	buffptr = buff;
+	
+	if(status & (PYFCGI_WORKER_FAIL | PYFCGI_MASTER_FAIL))
+	{
+		buffptr += ret = snprintf(buffptr, left, "%s ",
+			(status & PYFCGI_WORKER_FAIL)?"Worker":"Master");
+		left -= ret;
+		status &= ((0xFFFF) ^ (PYFCGI_WORKER_FAIL | PYFCGI_MASTER_FAIL));
+	}
+	if(status & PYFCGI_FATAL)
+	{
+		buffptr += ret = snprintf(buffptr, left, "fatal ");
+		left -= ret;
+		status ^= PYFCGI_FATAL;
+	}
+	if(status & EXIT_PYERR)
+	{
+		buffptr += ret = snprintf(buffptr, left, "Python");
+		left -= ret;
+		status ^= EXIT_PYERR;
+	}
+	if( status & PYFCGI_TIMEOUT)
+	{
+		buffptr += ret = snprintf(buffptr, left, "Timeout");
+		left -= ret;
+		reason = 1;
+		status ^= PYFCGI_TIMEOUT;
+	}
+	if(status & PYFCGI_ERR)
+	{
+		buffptr += ret = snprintf(buffptr, left, "Error");
+		left -= ret;
+		reason = 1;
+		status ^= PYFCGI_ERR;
+	}
+	if(!reason)
+	{
+		buffptr += ret = snprintf(buffptr, left, "Failure");
+		left -= ret;
+	}
+	if(status)
+	{
+		buffptr += ret = snprintf(buffptr, left, "%d", status);
+		left -= ret;
+	}
+	return strndup(buff, 1024);
+}