Use different syslog facilities for error, conn, and stats logs, so they can be filtered into separate log files in syslog.conf

Author: sonertari

log.c

@@ -83,7 +83,7 @@ log_err_writecb(int level, UNUSED void *fh, const void *buf, size_t sz)
 		case LOG_ERR_MODE_STDERR:
 			return fwrite(buf, sz - 1, 1, stderr);
 		case LOG_ERR_MODE_SYSLOG:
-			syslog(level, "%s", (const char *)buf);
+			syslog(LOG_DAEMON|level, "%s", (const char *)buf);
 			return sz;
 	}
 	return -1;
@@ -292,20 +292,31 @@ log_connect_fini(void)
 	close(connect_fd);
 }
 
-int
-log_stats(const char *buf)
+static int
+log_info(int facility, const char *buf)
 {
 	size_t sz = strlen(buf) + 1;
 	switch (err_mode) {
 		case LOG_ERR_MODE_STDERR:
 			return fwrite(buf, sz - 1, 1, stderr);
 		case LOG_ERR_MODE_SYSLOG:
-			syslog(LOG_INFO, "%s", (const char *)buf);
+			syslog(facility|LOG_INFO, "%s", (const char *)buf);
 			return sz;
 	}
 	return -1;
 }
 
+int
+log_stats(const char *buf)
+{
+	return log_info(LOG_LOCAL0, buf);
+}
+
+int
+log_conn(const char *buf)
+{
+	return log_info(LOG_LOCAL1, buf);
+}
 
 /*
  * Content log.

log.h

@@ -63,6 +63,7 @@ extern logger_t *connect_log;
         logger_write_freebuf(connect_log, 0, NULL, 0, (buf), (sz))
 
 int log_stats(const char *);
+int log_conn(const char *);
 
 typedef struct log_content_ctx log_content_ctx_t;
 int log_content_open(log_content_ctx_t **, opts_t *, char *, char *, char *,

pxyconn.c

@@ -608,8 +608,8 @@ pxy_log_connect_nonhttp(pxy_conn_ctx_t *ctx)
 	if (!ctx->opts->detach) {
 		log_err_printf("%s", msg);
 	} else if (ctx->opts->statslog) {
-		if (log_stats(msg) == -1) {
-			log_err_level_printf(LOG_WARNING, "Stats logging failed\n");
+		if (log_conn(msg) == -1) {
+			log_err_level_printf(LOG_WARNING, "Conn logging failed\n");
 		}
 	}
 	if (ctx->opts->connectlog) {
@@ -717,8 +717,8 @@ pxy_log_connect_http(pxy_conn_ctx_t *ctx)
 	if (!ctx->opts->detach) {
 		log_err_printf("%s", msg);
 	} else if (ctx->opts->statslog) {
-		if (log_stats(msg) == -1) {
-			log_err_level_printf(LOG_WARNING, "Stats logging failed\n");
+		if (log_conn(msg) == -1) {
+			log_err_level_printf(LOG_WARNING, "Conn logging failed\n");
 		}
 	}
 	if (ctx->opts->connectlog) {

pxythrmgr.c

@@ -104,8 +104,8 @@ pxy_thrmgr_get_thr_expired_conns(pxy_thr_ctx_t *tctx, pxy_conn_ctx_t **expired_c
 					dst_addr = NULL;
 				}
 
-				if (log_stats(msg) == -1) {
-					log_err_level_printf(LOG_WARNING, "Stats logging failed\n");
+				if (log_conn(msg) == -1) {
+					log_err_level_printf(LOG_WARNING, "Expired conn logging failed\n");
 				}
 				free(msg);
 
@@ -205,8 +205,8 @@ pxy_thrmgr_print_thr_info(pxy_thr_ctx_t *tctx)
 					goto leave;
 				}
 
-				if (log_stats(smsg) == -1) {
-					log_err_level_printf(LOG_WARNING, "Stats logging failed\n");
+				if (log_conn(smsg) == -1) {
+					log_err_level_printf(LOG_WARNING, "Idle conn logging failed\n");
 				}
 				free(smsg);
 				smsg = NULL;