From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Wed, 14 Feb 2018 10:22:18 +0000 (+0000)
Subject: [Minor] Fix groups check for symbols
X-Git-Tag: 1.7.0~193
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f24c709d32e38649ddf053ae7d3d66219446752;p=thirdparty%2Frspamd.git

[Minor] Fix groups check for symbols
---

diff --git a/lualib/rspamd_config_transform.lua b/lualib/rspamd_config_transform.lua
index e74c0f689c..6b9e0ec27e 100644
--- a/lualib/rspamd_config_transform.lua
+++ b/lualib/rspamd_config_transform.lua
@@ -152,16 +152,20 @@ local function symbol_transform(cfg, k, v)
       return
     end
   end
+  -- Now check what Rspamd knows about this symbol
+  local sym = rspamd_config:get_metric_symbol(k)
+
+  if not k or not k.group then
+    -- Otherwise we just use group 'ungrouped'
+    if not cfg.group.ungrouped then
+      cfg.group.ungrouped = {
+        symbols = {}
+      }
+    end
 
-  -- Otherwise we just use group 'ungrouped'
-  if not cfg.group.ungrouped then
-    cfg.group.ungrouped = {
-      symbols = {}
-    }
+    cfg.group.ungrouped.symbols[k] = v
+    logger.infox("adding symbol %s to the group 'ungrouped'", k)
   end
-
-  cfg.group.ungrouped.symbols[k] = v
-  logger.infox("adding symbol %s to the group 'ungrouped'", k)
 end
 
 local function test_groups(groups)