From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Tue, 26 Apr 2016 11:16:58 +0000 (+0100)
Subject: [Fix] Add more priority for config file symbols registered from UCL
X-Git-Tag: 1.3.0~628
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=603902c2d8d0f89de50007b7b8d344740918f0d5;p=rspamd.git

[Fix] Add more priority for config file symbols registered from UCL
---

diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index db4d26b76..b35aeacc3 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -358,7 +358,7 @@ rspamd_rcl_symbol_handler (rspamd_mempool_t *pool, const ucl_object_t *obj,
 		priority = ucl_object_toint (elt);
 	}
 	else {
-		priority = ucl_object_get_priority (obj);
+		priority = ucl_object_get_priority (obj) + 1;
 	}
 
 	elt = ucl_object_lookup (obj, "description");
diff --git a/src/plugins/lua/spamassassin.lua b/src/plugins/lua/spamassassin.lua
index f90a838c3..0083d8bb4 100644
--- a/src/plugins/lua/spamassassin.lua
+++ b/src/plugins/lua/spamassassin.lua
@@ -1415,7 +1415,7 @@ local function post_process()
           rspamd_config:set_metric_symbol({
             name = k, score = r['score'],
             description = r['description'],
-            priority = 1,
+            priority = 2,
             one_shot = true })
           scores_added[k] = 1
         end
@@ -1478,7 +1478,7 @@ local function post_process()
     if not scores_added[key] then
       rspamd_config:set_metric_symbol({
             name = key, score = score,
-            priority = 1, flags = 'ignore'})
+            priority = 2, flags = 'ignore'})
     end
   end, scores)