From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 17 Sep 2015 13:27:06 +0000 (+0100)
Subject: Add special knob for systemd logging.
X-Git-Tag: 1.0.0~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80959ef9ac9ed96616c61c8793498c4709615401;p=thirdparty%2Frspamd.git

Add special knob for systemd logging.
---

diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index 4d87bf8e4c..6ce3f58f7e 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -202,6 +202,7 @@ struct rspamd_config {
 	GHashTable *debug_modules;                      /**< logging modules to debug							*/
 	gboolean log_color;                             /**< output colors for console output                   */
 	gboolean log_extended;                          /**< log extended information							*/
+	gboolean log_systemd;                           /**< special case for systemd logger					*/
 
 	gboolean mlock_statfile_pool;                   /**< use mlock (2) for locking statfiles				*/
 
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 3a98cdd55d..263ba9e409 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1190,6 +1190,16 @@ rspamd_rcl_config_init (void)
 		rspamd_rcl_parse_struct_boolean,
 		G_STRUCT_OFFSET (struct rspamd_config, log_color),
 		0);
+	rspamd_rcl_add_default_handler (sub,
+			"log_systemd",
+			rspamd_rcl_parse_struct_boolean,
+			G_STRUCT_OFFSET (struct rspamd_config, log_systemd),
+			0);
+	rspamd_rcl_add_default_handler (sub,
+			"systemd",
+			rspamd_rcl_parse_struct_boolean,
+			G_STRUCT_OFFSET (struct rspamd_config, log_systemd),
+			0);
 	rspamd_rcl_add_default_handler (sub,
 			"debug_modules",
 			rspamd_rcl_parse_struct_string_list,
diff --git a/src/libutil/logger.c b/src/libutil/logger.c
index 7a10b4ec76..cca21f870c 100644
--- a/src/libutil/logger.c
+++ b/src/libutil/logger.c
@@ -748,9 +748,12 @@ file_log_function (const gchar *log_domain,
 		}
 
 		/* Format time */
-		tms = localtime (&now);
+		if (!rspamd_log->cfg->log_systemd) {
+			tms = localtime (&now);
+
+			strftime (timebuf, sizeof (timebuf), "%F %H:%M:%S", tms);
+		}
 
-		strftime (timebuf, sizeof (timebuf), "%F %H:%M:%S", tms);
 		cptype = g_quark_to_string (rspamd_log->process_type);
 
 		if (rspamd_log->cfg->log_color) {
@@ -771,12 +774,20 @@ file_log_function (const gchar *log_domain,
 			r = 0;
 		}
 
-		r += rspamd_snprintf (tmpbuf + r,
-				sizeof (tmpbuf) - r,
-				"%s #%P(%s) ",
-				timebuf,
-				rspamd_log->pid,
-				cptype);
+		if (!rspamd_log->cfg->log_systemd) {
+			r += rspamd_snprintf (tmpbuf + r,
+					sizeof (tmpbuf) - r,
+					"%s #%P(%s) ",
+					timebuf,
+					rspamd_log->pid,
+					cptype);
+		}
+		else {
+			r += rspamd_snprintf (tmpbuf + r,
+					sizeof (tmpbuf) - r,
+					"(%s) ",
+					cptype);
+		}
 
 		modulebuf[0] = '\0';
 		mremain = sizeof (modulebuf);