]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Minor] Add explicit_disable flag to metadata exporter
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 5 Jun 2020 14:56:34 +0000 (15:56 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 5 Jun 2020 15:49:05 +0000 (16:49 +0100)
Issue: #3393
Closes: #3393
src/plugins/lua/force_actions.lua
src/plugins/lua/metadata_exporter.lua

index 9654a836e23ac6f8f0425c94c32f00adb8a10e2f..eca63726ebeb62892ce608bd15b0dd320b530732 100644 (file)
@@ -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
index 27b0b10f64e5aa206827ddcbf8b493282e0fefaa..20457461b4923f8f22c9f11c2155972b0841a240 100644 (file)
@@ -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