From: Vsevolod Stakhov Date: Wed, 26 Jun 2019 12:24:03 +0000 (+0100) Subject: [Fix] Fix redis sentinel support X-Git-Tag: 2.0~720 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ac44f3b22819c2046b7820721e8f7ddd774b505;p=thirdparty%2Frspamd.git [Fix] Fix redis sentinel support Issue: #2796 --- diff --git a/lualib/lua_redis.lua b/lualib/lua_redis.lua index 941ac383a6..37cdb7b6a1 100644 --- a/lualib/lua_redis.lua +++ b/lualib/lua_redis.lua @@ -230,7 +230,7 @@ local function add_redis_sentinels(params) params.sentinel_master_maxerrors = 2 -- Maximum number of errors before rechecking end - rspamd_config:add_on_load(function(cfg, ev_base, worker) + rspamd_config:add_on_load(function(_, ev_base, worker) local initialised = false if worker:is_scanner() then rspamd_config:add_periodic(ev_base, 0.0, function() @@ -304,8 +304,8 @@ local function process_redis_opts(options, redis_params) redis_params['password'] = options['password'] end - if not redis_params.sentinel and options.sentinel then - redis_params.sentinel = options.sentinel + if not redis_params.sentinels and options.sentinels then + redis_params.sentinels = options.sentinels end end