[Fix] Reduce maps aggressiveness

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 982415fdbb53fd54b43e678a4a5cafe44b28cc2f..2791c28d49bc9e0ff5a9ee25134134fd59ba8d39 100644 (file)
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -35,7 +35,7 @@
 
 #define DEFAULT_RLIMIT_NOFILE 2048
 #define DEFAULT_RLIMIT_MAXCORE 0
-#define DEFAULT_MAP_TIMEOUT 10
+#define DEFAULT_MAP_TIMEOUT 60.0 * 5
 #define DEFAULT_MIN_WORD 4
 #define DEFAULT_MAX_WORD 40
 #define DEFAULT_WORDS_DECAY 200

diff --git a/src/libutil/map.c b/src/libutil/map.c
index aefd8eb087d6729de9dd7304e6f65265eece4c41..b8d04dc5d58fb03dfd53e8386223737cfb16cd4c 100644 (file)
--- a/src/libutil/map.c
+++ b/src/libutil/map.c
@@ -859,7 +859,7 @@ rspamd_map_schedule_periodic (struct rspamd_map *map,
                timeout = map->poll_timeout * error_mult;
        }
        else if (locked) {
-               timeout = lock_mult;
+               timeout = map->poll_timeout * lock_mult;
        }
 
        cbd = g_slice_alloc0 (sizeof (*cbd));