From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 25 Jun 2019 08:53:25 +0000 (+0100)
Subject: [Fix] Settings: Fix settings check flags
X-Git-Tag: 2.0~738
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe95fc9e1b9914c0a5307cddf8134778197dd4ea;p=thirdparty%2Frspamd.git

[Fix] Settings: Fix settings check flags
---

diff --git a/src/plugins/lua/settings.lua b/src/plugins/lua/settings.lua
index 990fa47c37..e3e4b8986f 100644
--- a/src/plugins/lua/settings.lua
+++ b/src/plugins/lua/settings.lua
@@ -159,7 +159,7 @@ local function check_query_settings(task)
           elt.apply = lua_util.override_defaults(nset, elt.apply)
         end
         apply_settings(task, elt['apply'], settings_id)
-        rspamd_logger.infox(task, "applying settings id %s", settings_id)
+        rspamd_logger.infox(task, "applied settings id %s", settings_id)
         return true
       end
     else
@@ -955,8 +955,8 @@ end
 
 rspamd_config:register_symbol({
   name = 'SETTINGS_CHECK',
-  type = 'prefilter,nostat',
+  type = 'prefilter',
   callback = check_settings,
   priority = 10,
-  flags = 'empty',
+  flags = 'empty,nostat,explicit_disable,ignore_passthrough',
 })
diff --git a/test/functional/cases/108_settings.robot b/test/functional/cases/108_settings.robot
index 071ad88d73..2fc27ea701 100644
--- a/test/functional/cases/108_settings.robot
+++ b/test/functional/cases/108_settings.robot
@@ -107,7 +107,7 @@ SETTINGS ID - VIRTUAL
 
 SETTINGS ID - VIRTUAL GROUP
   ${result} =  Scan Message With Rspamc  ${MESSAGE}  --header  Settings-Id=id_virtual_group
-  Check Rspamc  ${result}  SIMPLE_VIRTUAL
+  Check Rspamc  ${result}  SIMPLE_VIRTUAL (10
   Should Not Contain  ${result.stdout}  SIMPLE_TEST
   Should Not Contain  ${result.stdout}  SIMPLE_VIRTUAL1
   Should Not Contain  ${result.stdout}  SIMPLE_POST
diff --git a/test/functional/configs/settings.conf b/test/functional/configs/settings.conf
index 11f7139e59..d46c46b306 100644
--- a/test/functional/configs/settings.conf
+++ b/test/functional/configs/settings.conf
@@ -23,6 +23,7 @@ settings {
   id_virtual_group {
     apply {
       groups_enabled = ["vg"];
+      SIMPLE_VIRTUAL = 10.0;
     }
   }
 }