From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 6 Dec 2018 15:36:22 +0000 (+0000)
Subject: [Conf] Move to options
X-Git-Tag: 1.9.0~478
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb754830077b048542d581e2fb29df4d952078b1;p=thirdparty%2Frspamd.git

[Conf] Move to options
---

diff --git a/conf/options.inc b/conf/options.inc
index a75c6341d8..108a153e5b 100644
--- a/conf/options.inc
+++ b/conf/options.inc
@@ -42,3 +42,6 @@ rrd = "${DBDIR}/rspamd.rrd";
 # Local networks
 local_addrs = [192.168.0.0/16, 10.0.0.0/8, 172.16.0.0/12, fd00::/8, 169.254.0.0/16, fe80::/10];
 hs_cache_dir = "${DBDIR}/";
+
+# Timeout for messages processing (must be larger than any internal timeout used)
+task_timeout = 8s;
diff --git a/conf/worker-normal.inc b/conf/worker-normal.inc
index 72aef0b841..532455d0ad 100644
--- a/conf/worker-normal.inc
+++ b/conf/worker-normal.inc
@@ -1,4 +1,3 @@
 # Included from top-level .conf file
 
 mime = true;
-task_timeout = 8s;