From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 19 May 2017 15:12:57 +0000 (+0100)
Subject: [Fix] Fix Redis timeout set
X-Git-Tag: 1.6.0~165
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f7054dc0b595e3ed714a5d859c049672aa2eba08;p=rspamd.git

[Fix] Fix Redis timeout set

Issue: #1646
---

diff --git a/lualib/global_functions.lua b/lualib/global_functions.lua
index 17c8f11ea..4447f85ef 100644
--- a/lualib/global_functions.lua
+++ b/lualib/global_functions.lua
@@ -38,11 +38,13 @@ local function rspamd_parse_redis_server(module_name)
 
     -- Store options
     if not result['timeout'] then
-      result['timeout'] = default_timeout
-    end
-    if options['timeout'] and not result['timeout'] then
-      result['timeout'] = tonumber(options['timeout'])
+      if options['timeout'] then
+        result['timeout'] = tonumber(options['timeout'])
+      else
+        result['timeout'] = default_timeout
+      end
     end
+
     if options['prefix'] and not result['prefix'] then
       result['prefix'] = options['prefix']
     end