From cdfb0245ba675f18e1a510e46fa42177ccbe91a1 Mon Sep 17 00:00:00 2001 From: AL Date: Sun, 13 Nov 2016 14:33:17 +0300 Subject: [PATCH] Clearer greylist module code --- src/plugins/lua/greylist.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua index d32f411d8..f3667177c 100644 --- a/src/plugins/lua/greylist.lua +++ b/src/plugins/lua/greylist.lua @@ -275,10 +275,10 @@ local function greylist_set(task) end local action = task:get_metric_action('default') - if do_greylisting_required then - if do_greylisting_required ~= "1" or action == 'reject' then return end + if action == 'reject' then return end + if do_greylisting_required and do_greylisting_required ~= "1" then return end else - if action == 'no action' or action == 'reject' then return end + if action == 'no action' then return end end local body_key = data_key(task) local meta_key = envelope_key(task) @@ -322,7 +322,7 @@ local function greylist_set(task) rspamd_logger.infox(task, 'got error while connecting to redis: %1', upstream:get_addr()) upstream:fail() end - elseif do_greylisting or do_greylisting_required then + elseif do_greylisting or (do_greylisting_required and do_greylisting_required == "1") then local t = tostring(math.floor(rspamd_util.get_time())) local end_time = rspamd_util.time_to_string(t + settings['timeout']) rspamd_logger.infox(task, 'greylisted until "%s", new record', end_time) -- 2.39.5