summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-03-17 12:34:34 +0000
committerGitHub <noreply@github.com>2017-03-17 12:34:34 +0000
commit40b962ad045da645f5e868dae6d233dd5dbe72e0 (patch)
tree8bacf23bfc5e5dd72fa43f32feb35d30b08200e1
parentacaab181ef7fccdd99786880f25b7ff5ba3ec950 (diff)
parent289f5ffa7f3103ae19c19330a4227065973eccb6 (diff)
downloadrspamd-40b962ad045da645f5e868dae6d233dd5dbe72e0.tar.gz
rspamd-40b962ad045da645f5e868dae6d233dd5dbe72e0.zip
Merge pull request #1534 from fatalbanana/glS
[Minor] Greylisting: fix greylist_min_score
-rw-r--r--src/plugins/lua/greylist.lua5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/lua/greylist.lua b/src/plugins/lua/greylist.lua
index 4a155e8a5..04d911545 100644
--- a/src/plugins/lua/greylist.lua
+++ b/src/plugins/lua/greylist.lua
@@ -231,7 +231,7 @@ local function greylist_set(task)
local ip = task:get_ip()
if settings.greylist_min_score then
- local score = task:get_metric_score('default')
+ local score = task:get_metric_score('default')[1]
if score < settings.greylist_min_score then
rspamd_logger.infox(task, 'Score too low - skip greylisting')
if action == 'greylist' then
@@ -388,6 +388,9 @@ if opts then
settings[k] = v
end
end
+ if settings['greylist_min_score'] then
+ settings['greylist_min_score'] = tonumber(settings['greylist_min_score'])
+ end
whitelisted_ip = rspamd_map_add('greylist', 'whitelisted_ip', 'radix',
'Greylist whitelist ip map')
whitelist_domains_map = rspamd_map_add('greylist', 'whitelist_domains_url',