Browse Source

[Config] Improve default logging

tags/1.4.0
Vsevolod Stakhov 7 years ago
parent
commit
aae6b4505c
2 changed files with 8 additions and 6 deletions
  1. 5
    4
      conf/logging.inc
  2. 3
    2
      src/libserver/cfg_utils.c

+ 5
- 4
conf/logging.inc View File

@@ -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

+ 3
- 2
src/libserver/cfg_utils.c View File

@@ -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 */

Loading…
Cancel
Save