Add a --verbose option

Add --verbose -v option to log on stderr

include/conf.h

@@ -56,7 +56,7 @@
 
 #define PYFCGI_NAME "spawn-fcgi [OPTIONS] -- pyfcgi"
 
-#define PYFCGI_SHORT_OPT "Ce:E:Aw:W:m:L:Svh"
+#define PYFCGI_SHORT_OPT "Ce:E:Aw:W:m:L:SvVh"
 
 #define PYFCGI_LONG_OPT { \
 	{"config", required_argument, 0, 'C'},\
@@ -69,7 +69,8 @@
 	{"log", required_argument, 0, 'L'},\
 	{"syslog", no_argument, 0, 'S'},\
 	{"pid-file", required_argument, 0, 'P'},\
-	{"version", no_argument, 0, 'v'},\
+	{"verbose", no_argument, 0, 'v'},\
+	{"version", no_argument, 0, 'V'},\
 	{"help", no_argument, 0, 'h' },\
 	{0, 0, 0, 0}\
 }
@@ -85,6 +86,7 @@
 	{"Add a logfile using syntax : 'LOGFILE[;FILT][;FMT]'", "LOGGER_SPEC"},\
 	{"Use syslog for logging", NULL},\
 	{"Create a PID file", "FILENAME"},\
+	{"Send all loglines on stderr", NULL},\
 	{"Print PyFCGI and Python version and exit", NULL},\
 	{"Display this help and exit", NULL},\
 }
@@ -163,6 +165,8 @@ struct pyfcgi_conf_s
 	 * @ingroup conf_glob */
 	int max_reqs;
 
+	/**@brief 0 is silent 1 means logs to stderr */
+	short verbosity;
 
 	/**@brief Logger configuration
 	 * @ingroupe conf_glob */

include/logger.h

@@ -334,7 +334,7 @@ void pyfcgi_logger_enable_syslog(const char*);
 void _pyfcgi_logger_free(pyfcgi_logger_t*);
 
 /**@brief Add a new logger
- * @param char* filename
+ * @param char* filename or NULL if stderr (fd 2 ) wanted
  * @param logmask_t loglvl a mask indicating wich loglevels should be logged
  * @param logmask_t typemask a mask indicating wich facility should be logged
  * @param char* log format (or NULL for default format)

src/conf.c

@@ -45,6 +45,7 @@ void default_conf()
 	PyFCGI_conf.max_wrk = 5;
 	PyFCGI_conf.max_reqs = 1000;
 	PyFCGI_conf.pep333 = 1;
+	PyFCGI_conf.verbosity = 0;
 }
 
 int parse_args(int argc, char *argv[])
@@ -60,7 +61,7 @@ int parse_args(int argc, char *argv[])
 		if(c == -1) { break; }
 		switch(c)
 		{
-			case 'v':
+			case 'V':
 				print_version(1);
 				exit(0);
 			case 'C':
@@ -81,6 +82,11 @@ int parse_args(int argc, char *argv[])
 			case 'W':
 				PyFCGI_conf.max_wrk = atoi(optarg);
 				break;
+			case 'v':
+				PyFCGI_conf.verbosity = 1;
+				pyfcgi_logger_add(NULL, 0xFF, 0xFF,
+					PYFCGI_LOGGER_FMT_DEFAULT);
+				break;
 			case 'm':
 				PyFCGI_conf.max_reqs = atoi(optarg);
 				if(PyFCGI_conf.max_reqs < 0)

src/logger.c

@@ -5,6 +5,7 @@ int pyfcgi_logger_init()
 	pyfcgi_conf_logger_t *conf;
 	conf = &PyFCGI_conf.logs;
 	memset(conf, 0, sizeof(pyfcgi_conf_logger_t));
+
 	return 0;
 }
 
@@ -96,16 +97,22 @@ int pyfcgi_logger_add(const char *filename, logmask_t loglvl, logmask_t logtyp,
 
 	logger.loglvl = loglvl;
 	logger.logtyp = logtyp;
-	logger.filename = strdup(filename);
-	if(!logger.filename)
+	if(!filename)
 	{
-		err = errno;
-		pyfcgi_log(LOG_ALERT,
-			"Unable to duplicate logger filename : %s",
-			strerror(err));
-		return PYFCGI_FATAL;	
+		logger.filename = NULL;
+	}
+	else
+	{
+		logger.filename = strdup(filename);
+		if(!logger.filename)
+		{
+			err = errno;
+			pyfcgi_log(LOG_ALERT,
+				"Unable to duplicate logger filename : %s",
+				strerror(err));
+			return PYFCGI_FATAL;	
+		}
 	}
-
 	new_idx = conf->logger_sz;
 	conf->logger_sz++;
 	conf->loggers[new_idx] = logger;
@@ -546,6 +553,12 @@ const char* pyfcgi_logger_value_facility(short typ)
 
 int pyfcgi_logger_open(pyfcgi_logger_t *logger)
 {
+	if(!logger->filename)
+	{
+		logger->fd = 2;
+		return 0;
+	}
+
 	if( ((logger->fd = open(logger->filename,
 		O_WRONLY | O_APPEND | O_CREAT, 00640)) < 0) )
 	{

src/python_pyfcgi.c

@@ -441,7 +441,7 @@ PyObject* _pyfcgi_write_body(PyObject *body_data)
 	// if headers not sent yet, send them....
 	if(!libpyfcgi.headers_sent)
 	{
-		pyfcgi_log(LOG_DEBUG, "Headers not sent... sending them...");
+		//pyfcgi_log(LOG_DEBUG, "Headers not sent... sending them...");
 		libpyfcgi_send_headers();
 	}