diff options
| author | Andrew Lewis <nerf@judo.za.org> | 2017-08-25 17:36:13 +0200 |
|---|---|---|
| committer | Andrew Lewis <nerf@judo.za.org> | 2017-08-25 17:40:37 +0200 |
| commit | c13a5cbb44578df5a5387633ce058bfb417425ff (patch) | |
| tree | 03736f85c56f4bcb0d2d6ffde28e95469d3454f5 | |
| parent | c2750a8864dc0c0aa31f779d3841487b62408b6a (diff) | |
| download | rspamd-c13a5cbb44578df5a5387633ce058bfb417425ff.tar.gz rspamd-c13a5cbb44578df5a5387633ce058bfb417425ff.zip | |
[Fix] Redis script loading in DMARC; URL tags; URL reputation
- Issue: #1716
| -rw-r--r-- | src/plugins/lua/dmarc.lua | 3 | ||||
| -rw-r--r-- | src/plugins/lua/url_reputation.lua | 1 | ||||
| -rw-r--r-- | src/plugins/lua/url_tags.lua | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/lua/dmarc.lua b/src/plugins/lua/dmarc.lua index 3c2562b4c..14b7804dc 100644 --- a/src/plugins/lua/dmarc.lua +++ b/src/plugins/lua/dmarc.lua @@ -625,7 +625,6 @@ if opts['reporting'] == true then elseif not opts['send_reports'] then dmarc_reporting = true rspamd_config:add_on_load(function(cfg, ev_base, worker) - if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end load_scripts(cfg, ev_base) end) else @@ -642,9 +641,9 @@ if opts['reporting'] == true then end end rspamd_config:add_on_load(function(cfg, ev_base, worker) + load_scripts(cfg, ev_base) if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end local rresolver = rspamd_resolver.init(ev_base, rspamd_config) - load_scripts(cfg, ev_base) rspamd_config:register_finish_script(function () local stamp = pool:get_variable(VAR_NAME, 'double') if not stamp then diff --git a/src/plugins/lua/url_reputation.lua b/src/plugins/lua/url_reputation.lua index 73043aa4e..5c5dee14e 100644 --- a/src/plugins/lua/url_reputation.lua +++ b/src/plugins/lua/url_reputation.lua @@ -432,7 +432,6 @@ end whitelist = rspamd_map_add(N, 'whitelist', 'map', 'URL reputation whitelist') rspamd_config:add_on_load(function(cfg, ev_base, worker) - if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end load_scripts(cfg, ev_base) end) local id = rspamd_config:register_symbol({ diff --git a/src/plugins/lua/url_tags.lua b/src/plugins/lua/url_tags.lua index 3fe010546..9aa64e1f4 100644 --- a/src/plugins/lua/url_tags.lua +++ b/src/plugins/lua/url_tags.lua @@ -378,7 +378,6 @@ end settings.ignore_tags = list_to_hash(settings.ignore_tags) rspamd_config:add_on_load(function(cfg, ev_base, worker) - if not (worker:get_name() == 'normal' and worker:get_index() == 0) then return end load_scripts(cfg, ev_base) end) rspamd_config:register_symbol({ |