From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 17 Nov 2016 17:31:38 +0000 (+0000)
Subject: [Config] Improve default logging
X-Git-Tag: 1.4.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aae6b4505ce05c502f268710d522b088f2ef77dd;p=thirdparty%2Frspamd.git

[Config] Improve default logging
---

diff --git a/conf/logging.inc b/conf/logging.inc
index ac057670f4..24bb969729 100644
--- a/conf/logging.inc
+++ b/conf/logging.inc
@@ -2,8 +2,9 @@
 
 level = "info";
 log_format =<<EOD
-id: <$mid>,$if_qid{ qid: <$>,}$if_ip{ ip: $,}$if_user{ user: $,}$if_smtp_from{ from: <$>,}
-(default: $is_spam ($action): [$scores] [$symbols_scores]),
-len: $len, time: $time_real real,
-$time_virtual virtual, dns req: $dns_req
+id: <$mid>,$if_qid{ qid: <$>,}$if_ip{ ip: $,}
+$if_user{ user: $,}$if_smtp_from{ from: <$>,} (default: $is_spam
+($action): [$scores] [$symbols_scores_params]), len: $len, time: $time_real real,
+ $time_virtual virtual, dns req: $dns_req, digest: <$digest>
+$if_smtp_rcpts{ rcpts: <$>, }$if_mime_rcpt{ mime_rcpt: <$>, }
 EOD
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index e17ae315a8..1ca900f4cb 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -149,8 +149,9 @@ rspamd_config_new (void)
 	/* Default log line */
 	cfg->log_format_str = "id: <$mid>,$if_qid{ qid: <$>,}$if_ip{ ip: $,}"
 			"$if_user{ user: $,}$if_smtp_from{ from: <$>,} (default: $is_spam "
-			"($action): [$scores] [$symbols]), len: $len, time: $time_real real,"
-			" $time_virtual virtual, dns req: $dns_req";
+			"($action): [$scores] [$symbols_scores_params]), len: $len, time: $time_real real,"
+			" $time_virtual virtual, dns req: $dns_req, digest: <$digest>"
+			"$if_smtp_rcpts{ rcpts: <$>, }$if_mime_rcpt{ mime_rcpt: <$>, }";
 	/* Allow non-mime input by default */
 	cfg->allow_raw_input = TRUE;
 	/* Default maximum words processed */