diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-06-05 15:56:34 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-06-05 16:49:05 +0100 |
commit | a0abf274881281f3c7e7d604ab94bf3421b973d5 (patch) | |
tree | a786e52e9d3d9faa26f98cd4bf29a18dd8d07d45 /src/plugins | |
parent | 6ed27edd8928063530b9b113e1ac4a9554808d93 (diff) | |
download | rspamd-a0abf274881281f3c7e7d604ab94bf3421b973d5.tar.gz rspamd-a0abf274881281f3c7e7d604ab94bf3421b973d5.zip |
[Minor] Add explicit_disable flag to metadata exporter
Issue: #3393
Closes: #3393
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/lua/force_actions.lua | 4 | ||||
-rw-r--r-- | src/plugins/lua/metadata_exporter.lua | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/lua/force_actions.lua b/src/plugins/lua/force_actions.lua index 9654a836e..eca63726e 100644 --- a/src/plugins/lua/force_actions.lua +++ b/src/plugins/lua/force_actions.lua @@ -71,7 +71,7 @@ local function gen_cb(expr, act, pool, message, subject, raction, honor, limit, if not selector then selector_cache[selector_expr] = lua_selectors.create_selector_closure(rspamd_config, selector_expr, '', true) selector = selector_cache[selector_expr] - if not selector then + if not selector then rspamd_logger.errx(task, 'could not create selector [%1]', selector_expr) return "((could not create selector))" end @@ -86,7 +86,7 @@ local function gen_cb(expr, act, pool, message, subject, raction, honor, limit, extracted = '((error extracting value))' end return extracted - end + end local cact = task:get_metric_action('default') if cact == act then diff --git a/src/plugins/lua/metadata_exporter.lua b/src/plugins/lua/metadata_exporter.lua index 27b0b10f6..20457461b 100644 --- a/src/plugins/lua/metadata_exporter.lua +++ b/src/plugins/lua/metadata_exporter.lua @@ -612,6 +612,6 @@ for k, r in pairs(settings.rules) do type = 'idempotent', callback = gen_exporter(r), priority = 10, - flags = 'empty', + flags = 'empty,explicit_disable,ignore_passthrough', }) end |