aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-02-17 16:21:40 +0000
committerGitHub <noreply@github.com>2017-02-17 16:21:40 +0000
commitd3d4bc54c72827bd26b76738b3bfd6d5398d6286 (patch)
tree2fc9380a459e7fc6a2f547d1b890f62d5095314f
parentaa06387d2e2779e96cf50f2b4060d2e01cfb9be3 (diff)
parent9daf62847cdef2dfffa929a6e70c08bef4b4f869 (diff)
downloadrspamd-d3d4bc54c72827bd26b76738b3bfd6d5398d6286.tar.gz
rspamd-d3d4bc54c72827bd26b76738b3bfd6d5398d6286.zip
Merge pull request #1431 from fatalbanana/lu
[Minor] Fix rspamd_parse_redis_server
-rw-r--r--rules/global_functions.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/rules/global_functions.lua b/rules/global_functions.lua
index cab77b714..d0e9c07fb 100644
--- a/rules/global_functions.lua
+++ b/rules/global_functions.lua
@@ -3,8 +3,9 @@ local logger = require "rspamd_logger"
-- This function parses redis server definition using either
-- specific server string for this module or global
-- redis section
-function rspamd_parse_redis_server(module_name, result)
+function rspamd_parse_redis_server(module_name)
+ local result = {}
local default_port = 6379
local default_timeout = 1.0
local upstream_list = require "rspamd_upstream_list"
@@ -66,7 +67,6 @@ function rspamd_parse_redis_server(module_name, result)
-- Try local options
local opts = rspamd_config:get_all_opt(module_name)
- local result = {}
local ret = false
if opts then