瀏覽代碼

[Minor] Rbl: Improve WL logging

tags/2.0
Vsevolod Stakhov 4 年之前
父節點
當前提交
ad086586a4
共有 1 個文件被更改,包括 8 次插入2 次删除
  1. 8
    2
      src/plugins/lua/rbl.lua

+ 8
- 2
src/plugins/lua/rbl.lua 查看文件

@@ -824,7 +824,8 @@ local function add_rbl(key, rbl, global_opts)
if ret then
rbl.process_script = f
else
rspamd_logger.errx('invalid process script for rbl rule %s: %s; %s',
rspamd_logger.errx(rspamd_config,
'invalid process script for rbl rule %s: %s; %s',
key, rbl.process_script, f)
return false
end
@@ -837,13 +838,18 @@ local function add_rbl(key, rbl, global_opts)
end
rbl.whitelist = lua_maps.map_add_from_ucl(rbl.whitelist, def_type,
'RBL whitelist for ' .. rbl.symbol)
rspamd_logger.infox(rspamd_config, 'added %s whitelist for RBL %s',
def_type, rbl.symbol)
end

if not rbl.whitelist and global_opts.url_whitelist and
(rbl.urls or rbl.emails or rbl.dkim or rbl.replyto) then
(rbl.urls or rbl.emails or rbl.dkim or rbl.replyto) and
not (rbl.from or rbl.received) then
local def_type = 'set'
rbl.whitelist = lua_maps.map_add_from_ucl(global_opts.url_whitelist, def_type,
'RBL url whitelist for ' .. rbl.symbol)
rspamd_logger.infox(rspamd_config, 'added URL whitelist for RBL %s',
rbl.symbol)
end

local callback,description = gen_rbl_callback(rbl)

Loading…
取消
儲存