Continuing logger implementation

src/logger.c

@@ -122,10 +122,7 @@ int vpyfcgi_log(loglvl_t lvl, const char *fmt, va_list ap)
 
 	conf = &PyFCGI_conf.logs;
 
-	if(conf->flags & PYFCGI_LOG_FSYSLOG)
-	{
-		vsyslog(SYSLOG_LVLS[(lvl & 0xF0) >> 4], fmt, ap);
-	}
+	_vsyslog(lvl, fmt, ap);
 
 	len = 0;
 	if(conf->format_sz > 1)
@@ -133,12 +130,9 @@ int vpyfcgi_log(loglvl_t lvl, const char *fmt, va_list ap)
 		len = vdprintf(conf->pipes[1], fmt, ap);
 		if(len < 0)
 		{
-			if(conf->flags & PYFCGI_LOG_FSYSLOG)
-			{
-				syslog(SYSLOG_ALERT, 
-				       "Unable to write to multiplexer pipe when trying to log : %s",
-				       strerror(errno));
-			}
+			_syslog(LOG_ALERT, 
+			       "Unable to write to multiplexer pipe when trying to log : %s",
+			       strerror(errno));
 			return PYFCGI_FATAL;
 		}
 	}
@@ -147,12 +141,9 @@ int vpyfcgi_log(loglvl_t lvl, const char *fmt, va_list ap)
 		len = vdprintf(conf->loggers[0].fd, fmt, ap);
 		if(len < 0)
 		{
-			if(conf->flags & PYFCGI_LOG_FSYSLOG)
-			{
-				syslog(SYSLOG_ALERT, 
-				       "Unable to write to single FD to '%s' when trying to log : %s",
-				       conf->loggers[0].filename, strerror(errno));
-			}
+			_syslog(LOG_ALERT, 
+			       "Unable to write to single FD to '%s' when trying to log : %s",
+			       conf->loggers[0].filename, strerror(errno));
 			return PYFCGI_FATAL;
 		}
 		return 0;
@@ -162,40 +153,34 @@ int vpyfcgi_log(loglvl_t lvl, const char *fmt, va_list ap)
 		ret = tee(conf->pipes[0], conf->loggers[i].fd, len, 0);
 		if(ret < 0)
 		{
-			if(conf->flags & PYFCGI_LOG_FSYSLOG)
-			{
-				syslog(SYSLOG_ALERT, 
-				       "Unable to splice to last logfile '%s' : %s",
-				       conf->loggers[i].filename, strerror(errno));
-			}
+			_syslog(LOG_ALERT, 
+			       "Unable to splice to last logfile '%s' : %s",
+			       conf->loggers[i].filename, strerror(errno));
 			return PYFCGI_FATAL;
 		}
 	}
 	ret = splice(conf->pipes[0], NULL, conf->loggers[i].fd, NULL, len, 0);
 	if(ret < 0)
 	{
-		if(conf->flags & PYFCGI_LOG_FSYSLOG)
-		{
-			syslog(SYSLOG_ALERT, 
-			       "Unable to splice to last logfile '%s' : %s",
-			       conf->loggers[i].filename, strerror(errno));
-		}
+		_syslog(LOG_ALERT, 
+		       "Unable to splice to last logfile '%s' : %s",
+		       conf->loggers[i].filename, strerror(errno));
 		return PYFCGI_ERR;
 	}
 	if(ret < len)
 	{
-		if(conf->flags & PYFCGI_LOG_FSYSLOG)
-		{
-			syslog(SYSLOG_WARNING, 
-			       "Unable to splice all data to logfile. Flushing pipe.");
-		}
+		_syslog(LOG_WARNING, 
+		       "Unable to splice all data to logfile. Flushing pipe.");
 
 		do
 		{
 			len -= (ret<len)?ret:len;
-			ret = read(conf->pipes[0], buf, len>512?512:len);
+			ret = read(conf->pipes[0], buf, (len>sizeof(buf))?sizeof(buf):len);
 			if(ret < 0)
 			{
+				_syslog(LOG_CRIT,
+				        "Logger pipe seems broken, unable to flush : %s",
+					strerror(errno));
 				return PYFCGI_ERR;
 			}
 		}while(len);

src/logger.h

@@ -31,6 +31,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
+/**@file logger.h
+ * @brief PyFCGI logging facility
+ * @ingroup conf_logger
+ */
 /**@defgroup conf_logger Logging configuration
  * @ingroup conf_internal
  */
@@ -47,6 +51,8 @@
 /**@ingroup log_facility */
 #define LOG_MASTER 8
 
+#define SYSLOG_syslog syslog
+#define SYSLOG_vsyslog vsyslog
 #define SYSLOG_EMERG   LOG_EMERG
 #define SYSLOG_ALERT   LOG_ALERT
 #define SYSLOG_CRIT    LOG_CRIT
@@ -78,6 +84,29 @@ const short SYSLOG_LVLS[8] = {LOG_EMERG, LOG_ALERT, LOG_CRIT, LOG_ERR,
 #define LOG_INFO (7 << 4)
 #define LOG_DEBUG (8 << 4)
 
+/**@brief Convert a PyFCGI loglevel in a syslog one */
+#define PYFCGI_SYSLOG_LVL(lvl) (SYSLOG_LVLS[(lvl & 0xF0) >> 4])
+
+/**@brief Macro checking if syslog is activated and log a message
+ * @params int lvl the PyFCGI log level
+ * @param char* fmt the message format
+ * @see _vsyslog syslog
+ */
+#define _syslog(lvl, ...) if(conf->flags & PYFCGI_LOG_FSYSLOG) { \
+	syslog(PYFCGI_SYSLOG_LVL(lvl), __VA_ARGS__);\
+}
+#define _vsyslog(lvl, fmt, ap) if(conf->flags & PYFCGI_LOG_FSYSLOG) { \
+	vsyslog(PYFCGI_SYSLOG_LVL(lvl), fmt, ap);\
+}
+
+/**@brief Macro checking if syslog is activated and log a message using PyFCGI
+ * loglevels
+ * @params int lvl the PyFCGI log level
+ * @param char* fmt the message format
+ * @see vsyslog _syslog
+ */
+
+
 /**@defgroup conf_logger_flags Logger confifurations flags
  * @ingroup conf_logger */
 /**@ingroup cong_logger_flags */