Logger enhancement + deleted unused warning in pyworker.c

include/logger.h

@@ -137,6 +137,8 @@
 
 #define PYFCGI_LOGGER_FMT_DEFAULT "{datetime} {ident}[{pid}] {level} {msg}"
 #define PYFCGI_LOGGER_TIME_FMT_DEFAULT "%F %T%z"
+#define PYFCGI_SYSLOG_IDENT_FMT "pyfcgi(%d)[%s]"
+#define PYFCGI_SYSLOG_IDENT_FMT_SHORT "pyfcgi(%d)"
 
 
 /**@brief Log level mask

src/logger.c

@@ -35,21 +35,36 @@ int pyfcgi_logger_stop()
 void pyfcgi_logger_enable_syslog(const char* nident)
 {
 	pyfcgi_conf_logger_t *conf;
+	char ident[64];
+	size_t ret;
+
 	conf = &PyFCGI_conf.logs;
 	if(conf->flags & PYFCGI_LOG_FSYSLOG)
 	{
 		closelog();
 	}
 	conf->flags |= PYFCGI_LOG_FSYSLOG;
-	if(!nident)
+
+	ret = 0;
+	if(nident)
 	{
-		nident = conf->ident;
+		ret = snprintf(ident, 64, PYFCGI_SYSLOG_IDENT_FMT,
+			getpid(), nident);
+	}
+	if(!nident || ret >= 64)
+	{
+		ret = snprintf(ident, 64, PYFCGI_SYSLOG_IDENT_FMT_SHORT,
+			getpid());
+		if(ret <= 64)
+		{
+			snprintf(ident, 64, "pyfcgi");
+		}
 	}
 	if(conf->syslog_ident)
 	{
 		free(conf->syslog_ident);
 	}
-	conf->syslog_ident = strdup(nident);
+	conf->syslog_ident = strdup(ident);
 	openlog(conf->syslog_ident, LOG_CONS | LOG_PERROR, LOG_DAEMON | LOG_USER);
 }
 

src/pyworker.c

@@ -42,7 +42,7 @@ int work333(int wrk_id, int semid)
 		*start_response, *args;
 	FCGX_Stream *in_stream, *out_stream, *err_stream;
 	char **envp;
-	int count, pipe_out[2], pipe_err[2], err;
+	int count, pipe_out[2], pipe_err[2];
 	int max_reqs;
 	char ident[128];
 	struct timeval start, stop;