[Config] Improve default logging

diff --git a/conf/logging.inc b/conf/logging.inc
index ac057670f4ebe3f32758ed476277af1404a60238..24bb9697299d4f064bade8e628f2657f6ab1e7af 100644 (file)
--- 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 e17ae315a8448e7c8cfd2f5575ebfd1d846311db..1ca900f4cb6518880fd344409d34e98c99f6a849 100644 (file)
--- 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 */