From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 30 Oct 2018 16:23:21 +0000 (+0000)
Subject: [Minor] Fix expiry config overriding
X-Git-Tag: 1.8.2~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0584524b42a8fe196e77994c8cff0f08ad03ed3;p=thirdparty%2Frspamd.git

[Minor] Fix expiry config overriding
---

diff --git a/src/plugins/lua/bayes_expiry.lua b/src/plugins/lua/bayes_expiry.lua
index 9495cf0cd1..e0bec119fe 100644
--- a/src/plugins/lua/bayes_expiry.lua
+++ b/src/plugins/lua/bayes_expiry.lua
@@ -44,6 +44,10 @@ local function check_redis_classifier(cls, cfg)
   if cls.new_schema then
     local symbol_spam, symbol_ham
     local expiry = (cls.expiry or cls.expire)
+    if type(expiry) == 'table' then
+      expiry = expiry[1]
+    end
+
     if cls.lazy then settings.lazy = cls.lazy end
     -- Load symbols from statfiles
     local statfiles = cls.statfile
@@ -68,7 +72,7 @@ local function check_redis_classifier(cls, cfg)
       end
     end
 
-    if not symbol_spam or not symbol_ham or not expiry then
+    if not symbol_spam or not symbol_ham or not type(expiry) == 'number' then
       return
     end
     -- Now try to load redis_params if needed