commit 615df8d: [Rework] Eliminate lua_squeeze as it has shown no improvements

Vsevolod Stakhov vsevolod at highsecure.ru
Mon Jun 10 17:14:14 UTC 2019


Author: Vsevolod Stakhov
Date: 2019-06-10 16:33:19 +0100
URL: https://github.com/rspamd/rspamd/commit/615df8d1fa4ad75dc14fc29e36ac18b118df50b1 (HEAD -> master)

[Rework] Eliminate lua_squeeze as it has shown no improvements

---
 lualib/lua_squeeze_rules.lua    | 422 ----------------------------------------
 src/libserver/cfg_file.h        |   1 -
 src/libserver/cfg_rcl.c         |   6 -
 src/libserver/cfg_utils.c       |  17 --
 src/libserver/rspamd_symcache.c |  68 ++++---
 src/libserver/rspamd_symcache.h |   1 -
 src/lua/lua_config.c            | 296 +++++-----------------------
 src/plugins/lua/settings.lua    |   2 -
 8 files changed, 78 insertions(+), 735 deletions(-)

diff --git a/lualib/lua_squeeze_rules.lua b/lualib/lua_squeeze_rules.lua
deleted file mode 100644
index 309d19969..000000000
--- a/lualib/lua_squeeze_rules.lua
+++ /dev/null
@@ -1,422 +0,0 @@
---[[
-Copyright (c) 2018, Vsevolod Stakhov <vsevolod at highsecure.ru>
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-]]--
-
-local exports = {}
-local logger = require 'rspamd_logger'
-local lua_util = require 'lua_util'
-
--- Squeezed rules part
-local squeezed_rules = {{}} -- plain vector of all rules squeezed
-local squeezed_symbols = {} -- indexed by name of symbol
-local squeezed_deps = {} -- squeezed deps
-local squeezed_rdeps = {} -- squeezed reverse deps
-local SN = 'lua_squeeze'
-local squeeze_sym = 'LUA_SQUEEZE'
-local squeeze_function_ids = {}
-local squeezed_groups = {}
-local last_rule
-local virtual_symbols = {}
-
-local function gen_lua_squeeze_function(order)
-  return function(task)
-    local symbols_disabled = task:cache_get('squeezed_disable')
-    local mime_task = task:has_flag('mime')
-    for _,data in ipairs(squeezed_rules[order]) do
-      local disable = false
-      if symbols_disabled and symbols_disabled[data[2]] then
-        disable = true
-      end
-
-      if data[3] and data[3].flags.mime then
-        if not mime_task then
-          disable = true
-        end
-      end
-
-      if not disable then
-        local function real_call()
-          return {data[1](task)}
-        end
-
-        -- Too expensive to call :(
-        lua_util.debugm(SN, task, 'call for: %s', data[2])
-        local status, ret = pcall(real_call)
-
-        if not status then
-          logger.errx(task, 'error in squeezed rule %s: %s', data[2], ret)
-        else
-          if #ret ~= 0 then
-            local first = ret[1]
-            local sym = data[2]
-            -- Function has returned something, so it is rule, not a plugin
-            if type(first) == 'boolean' then
-              if first then
-                table.remove(ret, 1)
-
-                local second = ret[1]
-
-                if type(second) == 'number' then
-                  table.remove(ret, 1)
-                  if second ~= 0 then
-                    if type(ret[1]) == 'table' then
-                      task:insert_result(sym, second, ret[1])
-                    else
-                      task:insert_result(sym, second, ret)
-                    end
-                  end
-                else
-                  if type(ret[1]) == 'table' then
-                    task:insert_result(sym, 1.0, ret[1])
-                  else
-                    task:insert_result(sym, 1.0, ret)
-                  end
-                end
-              end
-            elseif type(first) == 'number' then
-              table.remove(ret, 1)
-
-              if first ~= 0 then
-                if type(ret[1]) == 'table' then
-                  task:insert_result(sym, first, ret[1])
-                else
-                  task:insert_result(sym, first, ret)
-                end
-              end
-            else
-              if type(ret[1]) == 'table' then
-                task:insert_result(sym, 1.0, ret[1])
-              else
-                task:insert_result(sym, 1.0, ret)
-              end
-            end
-          end
-        end
-      else
-        lua_util.debugm(SN, task, 'skip symbol due to settings: %s', data[2])
-      end
-
-
-      end
-  end
-end
-
-exports.squeeze_rule = function(s, func, flags)
-  if s then
-    if not squeezed_symbols[s] then
-      squeezed_symbols[s] = {
-        cb = func,
-        order = 0,
-        sym = s,
-        flags = flags or {}
-      }
-      lua_util.debugm(SN, rspamd_config, 'squeezed rule: %s', s)
-    else
-      logger.warnx(rspamd_config, 'duplicate symbol registered: %s, skip', s)
-    end
-  else
-    -- Unconditionally add function to the squeezed rules
-    local id = tostring(#squeezed_rules)
-    lua_util.debugm(SN, rspamd_config, 'squeezed unnamed rule: %s', id)
-    table.insert(squeezed_rules[1], {func, 'unnamed: ' .. id, squeezed_symbols[s]})
-  end
-
-  if not squeeze_function_ids[1] then
-    squeeze_function_ids[1] = rspamd_config:register_symbol{
-      type = 'callback',
-      flags = 'squeezed',
-      callback = gen_lua_squeeze_function(1),
-      name = squeeze_sym,
-      description = 'Meta rule for Lua rules that can be squeezed',
-      no_squeeze = true, -- to avoid infinite recursion
-    }
-  end
-
-  last_rule = s
-
-  return squeeze_function_ids[1]
-end
-
--- TODO: poor approach, we register all virtual symbols with the previous real squeezed symbol
-exports.squeeze_virtual = function(id, name)
-
-  if squeeze_function_ids[1] and id == squeeze_function_ids[1] and last_rule then
-    virtual_symbols[name] = last_rule
-    lua_util.debugm(SN, rspamd_config, 'add virtual symbol %s -> %s',
-        name, last_rule)
-
-    return id
-  end
-
-  return -1
-end
-
-exports.squeeze_dependency = function(child, parent)
-  lua_util.debugm(SN, rspamd_config, 'squeeze dep %s->%s', child, parent)
-
-  if not squeezed_deps[parent] then
-    squeezed_deps[parent] = {}
-  end
-
-  if not squeezed_deps[parent][child] then
-    squeezed_deps[parent][child] = true
-  else
-    logger.warnx(rspamd_config, 'duplicate dependency %s->%s', child, parent)
-  end
-
-  if not squeezed_rdeps[child] then
-    squeezed_rdeps[child] = {}
-  end
-
-  if not squeezed_rdeps[child][parent] then
-    squeezed_rdeps[child][parent] = true
-  end
-
-  return true
-end
-
-local function get_ordered_symbol_name(order)
-  if order == 1 then
-    return squeeze_sym
-  end
-
-  return squeeze_sym .. tostring(order)
-end
-
-local function register_topology_symbol(order)
-  local ord_sym = get_ordered_symbol_name(order)
-
-  squeeze_function_ids[order] = rspamd_config:register_symbol{
-    type = 'callback',
-    flags = 'squeezed',
-    callback = gen_lua_squeeze_function(order),
-    name = ord_sym,
-    description = 'Meta rule for Lua rules that can be squeezed, order ' .. tostring(order),
-    no_squeeze = true, -- to avoid infinite recursion
-  }
-
-  local parent = get_ordered_symbol_name(order - 1)
-  lua_util.debugm(SN, rspamd_config, 'registered new order of deps: %s->%s',
-      ord_sym, parent)
-  rspamd_config:register_dependency(ord_sym, parent, true)
-end
-
-exports.squeeze_init = function()
-  -- Do topological sorting
-  for _,v in pairs(squeezed_symbols) do
-    local function visit(node, order)
-
-      if order > node.order then
-        node.order = order
-        lua_util.debugm(SN, rspamd_config, "symbol: %s, order: %s", node.sym, order)
-      else
-        return
-      end
-
-      if squeezed_deps[node.sym] then
-        for dep,_ in pairs(squeezed_deps[node.sym]) do
-          if squeezed_symbols[dep] then
-            visit(squeezed_symbols[dep], order + 1)
-          end
-        end
-      end
-    end
-
-    if v.order == 0 then
-      visit(v, 1)
-    end
-  end
-
-  for parent,children in pairs(squeezed_deps) do
-    if not squeezed_symbols[parent] then
-      local real_parent = virtual_symbols[parent]
-      if real_parent then
-        parent = real_parent
-      end
-    end
-
-    if not squeezed_symbols[parent] then
-      -- Trivial case, external dependnency
-
-      for s,_ in pairs(children) do
-
-        if squeezed_symbols[s] then
-          -- External dep depends on a squeezed symbol
-          lua_util.debugm(SN, rspamd_config, 'register external squeezed dependency on %s',
-              parent)
-          rspamd_config:register_dependency(squeeze_sym, parent, true)
-        else
-          -- Generic rspamd symbols dependency
-          lua_util.debugm(SN, rspamd_config, 'register external dependency %s -> %s',
-              s, parent)
-          rspamd_config:register_dependency(s, parent, true)
-        end
-      end
-    else
-      -- Not so trivial case
-      local ps = squeezed_symbols[parent]
-
-      for cld,_ in pairs(children) do
-        if squeezed_symbols[cld] then
-          -- Cross dependency
-          lua_util.debugm(SN, rspamd_config, 'cross dependency in squeezed symbols %s->%s',
-              cld, parent)
-          local order = squeezed_symbols[cld].order
-          if not squeeze_function_ids[order] then
-            -- Need to register new callback symbol to handle deps
-            for i = 1, order do
-              if not squeeze_function_ids[i] then
-                register_topology_symbol(i)
-              end
-            end
-          end
-        else
-          -- External symbol depends on a squeezed one
-          local parent_symbol = get_ordered_symbol_name(ps.order)
-          rspamd_config:register_dependency(cld, parent_symbol, true)
-          lua_util.debugm(SN, rspamd_config, 'register squeezed dependency for external symbol %s->%s',
-              cld, parent_symbol)
-        end
-      end
-    end
-  end
-
-  -- We have now all deps being registered, so we can register virtual symbols
-  -- and create squeezed rules
-  for k,v in pairs(squeezed_symbols) do
-    local parent_symbol = get_ordered_symbol_name(v.order)
-    lua_util.debugm(SN, rspamd_config, 'added squeezed rule: %s (%s): %s',
-        k, parent_symbol, v)
-    rspamd_config:register_symbol{
-      type = 'virtual',
-      name = k,
-      flags = 'squeezed',
-      parent = squeeze_function_ids[v.order],
-      no_squeeze = true, -- to avoid infinite recursion
-    }
-    local metric_sym = rspamd_config:get_metric_symbol(k)
-
-    if metric_sym then
-      v.group = metric_sym.group
-      v.groups = metric_sym.groups
-      v.score = metric_sym.score
-      v.description = metric_sym.description
-
-      if v.group then
-        if not squeezed_groups[v.group] then
-          lua_util.debugm(SN, rspamd_config, 'added squeezed group: %s', v.group)
-          squeezed_groups[v.group] = {}
-        end
-
-        table.insert(squeezed_groups[v.group], k)
-
-      end
-      if v.groups then
-        for _,gr in ipairs(v.groups) do
-          if not squeezed_groups[gr] then
-            lua_util.debugm(SN, rspamd_config, 'added squeezed group: %s', gr)
-            squeezed_groups[gr] = {}
-          end
-
-          table.insert(squeezed_groups[gr], k)
-        end
-      end
-    else
-      lua_util.debugm(SN, rspamd_config, 'no metric symbol found for %s, maybe bug', k)
-    end
-    if not squeezed_rules[v.order] then
-      squeezed_rules[v.order] = {}
-    end
-    table.insert(squeezed_rules[v.order], {v.cb,k,v})
-  end
-end
-
-exports.handle_settings = function(task, settings)
-  local symbols_disabled = {}
-  local symbols_enabled = {}
-  local found = false
-  local disabled = false
-
-  if settings.default then settings = settings.default end
-
-  local function disable_all()
-    for k,sym in pairs(squeezed_symbols) do
-      if not symbols_enabled[k] and not (sym.flags and sym.flags.explicit_disable) then
-        symbols_disabled[k] = true
-      end
-    end
-  end
-
-  if settings.symbols_enabled then
-    disable_all()
-    found = true
-    disabled = true
-    for _,s in ipairs(settings.symbols_enabled) do
-      if squeezed_symbols[s] then
-        lua_util.debugm(SN, task, 'enable symbol %s as it is in `symbols_enabled`', s)
-        symbols_enabled[s] = true
-        symbols_disabled[s] = nil
-      end
-    end
-  end
-
-  if settings.groups_enabled then
-    if not disabled then
-      disable_all()
-    end
-    found = true
-    for _,gr in ipairs(settings.groups_enabled) do
-      if squeezed_groups[gr] then
-        for _,sym in ipairs(squeezed_groups[gr]) do
-          lua_util.debugm(SN, task, 'enable symbol %s as it is in `groups_enabled`', sym)
-          symbols_enabled[sym] = true
-          symbols_disabled[sym] = nil
-        end
-      end
-    end
-  end
-
-  if settings.symbols_disabled then
-    found = true
-    for _,s in ipairs(settings.symbols_disabled) do
-      lua_util.debugm(SN, task, 'try disable symbol %s as it is in `symbols_disabled`', s)
-      if not symbols_enabled[s] then
-        symbols_disabled[s] = true
-        lua_util.debugm(SN, task, 'disable symbol %s as it is in `symbols_disabled`', s)
-      end
-    end
-  end
-
-  if settings.groups_disabled then
-    found = true
-    for _,gr in ipairs(settings.groups_disabled) do
-      lua_util.debugm(SN, task, 'try disable group %s as it is in `groups_disabled`: %s', gr)
-      if squeezed_groups[gr] then
-        for _,sym in ipairs(squeezed_groups[gr]) do
-          if not symbols_enabled[sym] then
-            lua_util.debugm(SN, task, 'disable symbol %s as it is in `groups_disabled`', sym)
-            symbols_disabled[sym] = true
-          end
-        end
-      end
-    end
-  end
-
-  if found then
-    task:cache_set('squeezed_disable', symbols_disabled)
-  end
-end
-
-return exports
\ No newline at end of file
diff --git a/src/libserver/cfg_file.h b/src/libserver/cfg_file.h
index eccab1217..b5780a599 100644
--- a/src/libserver/cfg_file.h
+++ b/src/libserver/cfg_file.h
@@ -336,7 +336,6 @@ struct rspamd_config {
 	gboolean enable_sessions_cache;                 /**< Enable session cache for debug						*/
 	gboolean enable_experimental;                   /**< Enable experimental plugins						*/
 	gboolean disable_pcre_jit;                      /**< Disable pcre JIT									*/
-	gboolean disable_lua_squeeze;                   /**< Disable lua rules squeezing						*/
 	gboolean own_lua_state;                         /**< True if we have created lua_state internally		*/
 	gboolean soft_reject_on_timeout;                /**< If true emit soft reject on task timeout (if not reject) */
 
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 4c069db9e..db1b54cf8 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -1923,12 +1923,6 @@ rspamd_rcl_config_init (struct rspamd_config *cfg, GHashTable *skip_sections)
 				G_STRUCT_OFFSET (struct rspamd_config, disable_pcre_jit),
 				0,
 				"Disable PCRE JIT");
-		rspamd_rcl_add_default_handler (sub,
-				"disable_lua_squeeze",
-				rspamd_rcl_parse_struct_boolean,
-				G_STRUCT_OFFSET (struct rspamd_config, disable_lua_squeeze),
-				0,
-				"Disable Lua rules squeezing");
 		rspamd_rcl_add_default_handler (sub,
 				"min_word_len",
 				rspamd_rcl_parse_struct_integer,
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 586625184..1c8b2ce5f 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -819,23 +819,6 @@ rspamd_config_post_load (struct rspamd_config *cfg,
 	}
 
 	if (opts & RSPAMD_CONFIG_INIT_SYMCACHE) {
-		lua_State *L = cfg->lua_state;
-		int err_idx;
-
-		/* Process squeezed Lua rules */
-		lua_pushcfunction (L, &rspamd_lua_traceback);
-		err_idx = lua_gettop (L);
-
-		if (rspamd_lua_require_function (cfg->lua_state, "lua_squeeze_rules",
-				"squeeze_init")) {
-			if (lua_pcall (L, 0, 0, err_idx) != 0) {
-				msg_err_config ("call to squeeze_init script failed: %s",
-						lua_tostring (L, -1));
-			}
-		}
-
-		lua_settop (L, err_idx - 1);
-
 		/* Init config cache */
 		rspamd_symcache_init (cfg->cache);
 
diff --git a/src/libserver/rspamd_symcache.c b/src/libserver/rspamd_symcache.c
index bc3b5295c..42e40b68c 100644
--- a/src/libserver/rspamd_symcache.c
+++ b/src/libserver/rspamd_symcache.c
@@ -66,7 +66,6 @@ INIT_LOG_MODULE(symcache)
 	(dyn_item)->finished = 1
 #define CLR_FINISH_BIT(checkpoint, dyn_item) \
 	(dyn_item)->finished = 0
-
 static const guchar rspamd_symcache_magic[8] = {'r', 's', 'c', 2, 0, 0, 0, 0 };
 
 struct rspamd_symcache_header {
@@ -82,6 +81,21 @@ struct symcache_order {
 	ref_entry_t ref;
 };
 
+/*
+ * This structure is optimised to store ids list:
+ * - If the first element is -1 then use dynamic part, else use static part
+ */
+struct rspamd_symcache_id_list {
+	union {
+		guint32 st[4];
+		struct {
+			guint32 e;
+			guint32 dynlen;
+			guint *n;
+		} dyn;
+	};
+};
+
 struct rspamd_symcache_item {
 	/* This block is likely shared */
 	struct item_stat *st;
@@ -115,6 +129,9 @@ struct rspamd_symcache_item {
 	guint order;
 	gint id;
 	gint frequency_peaks;
+	/* Settings ids */
+	struct rspamd_symcache_id_list allowed_ids;
+	struct rspamd_symcache_id_list forbidden_ids;
 
 	/* Dependencies */
 	GPtrArray *deps;
@@ -143,7 +160,6 @@ struct rspamd_symcache {
 	GPtrArray *composites;
 	GPtrArray *idempotent;
 	GPtrArray *virtual;
-	GPtrArray *squeezed;
 	GList *delayed_deps;
 	GList *delayed_conditions;
 	rspamd_mempool_t *static_pool;
@@ -984,10 +1000,6 @@ rspamd_symcache_add_symbol (struct rspamd_symcache *cache,
 		}
 	}
 
-	if (item->type & SYMBOL_TYPE_SQUEEZED) {
-		g_ptr_array_add (cache->squeezed, item);
-	}
-
 	cache->used_items ++;
 	cache->id ++;
 
@@ -1127,7 +1139,6 @@ rspamd_symcache_destroy (struct rspamd_symcache *cache)
 		g_ptr_array_free (cache->postfilters, TRUE);
 		g_ptr_array_free (cache->idempotent, TRUE);
 		g_ptr_array_free (cache->composites, TRUE);
-		g_ptr_array_free (cache->squeezed, TRUE);
 		REF_RELEASE (cache->items_by_order);
 
 		if (cache->peak_cb != -1) {
@@ -1155,7 +1166,6 @@ rspamd_symcache_new (struct rspamd_config *cfg)
 	cache->idempotent = g_ptr_array_new ();
 	cache->composites = g_ptr_array_new ();
 	cache->virtual = g_ptr_array_new ();
-	cache->squeezed = g_ptr_array_new ();
 	cache->reload_time = cfg->cache_reload_time;
 	cache->total_hits = 1;
 	cache->total_weight = 1.0;
@@ -2331,7 +2341,7 @@ rspamd_symcache_disable_all_symbols (struct rspamd_task *task,
 	PTR_ARRAY_FOREACH (cache->items_by_id, i, item) {
 		dyn_item = rspamd_symcache_get_dynamic (checkpoint, item);
 
-		if (!(item->type & (SYMBOL_TYPE_SQUEEZED|skip_mask))) {
+		if (!(item->type & (skip_mask))) {
 			SET_FINISH_BIT (checkpoint, dyn_item);
 			SET_START_BIT (checkpoint, dyn_item);
 		}
@@ -2357,15 +2367,10 @@ rspamd_symcache_disable_symbol_checkpoint (struct rspamd_task *task,
 	item = rspamd_symcache_find_filter (cache, symbol);
 
 	if (item) {
-		if (!(item->type & SYMBOL_TYPE_SQUEEZED)) {
-			dyn_item = rspamd_symcache_get_dynamic (checkpoint, item);
-			SET_FINISH_BIT (checkpoint, dyn_item);
-			SET_START_BIT (checkpoint, dyn_item);
-			msg_debug_cache_task ("disable execution of %s", symbol);
-		}
-		else {
-			msg_debug_cache_task ("skip disabling squeezed symbol %s", symbol);
-		}
+		dyn_item = rspamd_symcache_get_dynamic (checkpoint, item);
+		SET_FINISH_BIT (checkpoint, dyn_item);
+		SET_START_BIT (checkpoint, dyn_item);
+		msg_debug_cache_task ("disable execution of %s", symbol);
 	}
 	else {
 		msg_info_task ("cannot disable %s: not found", symbol);
@@ -2391,15 +2396,10 @@ rspamd_symcache_enable_symbol_checkpoint (struct rspamd_task *task,
 	item = rspamd_symcache_find_filter (cache, symbol);
 
 	if (item) {
-		if (!(item->type & SYMBOL_TYPE_SQUEEZED)) {
-			dyn_item = rspamd_symcache_get_dynamic (checkpoint, item);
-			dyn_item->finished = 0;
-			dyn_item->started = 0;
-			msg_debug_cache_task ("enable execution of %s", symbol);
-		}
-		else {
-			msg_debug_cache_task ("skip enabling squeezed symbol %s", symbol);
-		}
+		dyn_item = rspamd_symcache_get_dynamic (checkpoint, item);
+		dyn_item->finished = 0;
+		dyn_item->started = 0;
+		msg_debug_cache_task ("enable execution of %s", symbol);
 	}
 	else {
 		msg_info_task ("cannot enable %s: not found", symbol);
@@ -2726,15 +2726,13 @@ rspamd_symcache_finalize_item (struct rspamd_task *task,
 		rspamd_task_profile_set (task, item->symbol, diff);
 	}
 
-	if (!(item->type & SYMBOL_TYPE_SQUEEZED)) {
-		if (diff > slow_diff_limit) {
-			msg_info_task ("slow rule: %s(%d): %.2f ms", item->symbol, item->id,
-					diff);
-		}
+	if (diff > slow_diff_limit) {
+		msg_info_task ("slow rule: %s(%d): %.2f ms", item->symbol, item->id,
+				diff);
+	}
 
-		if (rspamd_worker_is_scanner (task->worker)) {
-			rspamd_set_counter (item->cd, diff);
-		}
+	if (rspamd_worker_is_scanner (task->worker)) {
+		rspamd_set_counter (item->cd, diff);
 	}
 
 	/* Process all reverse dependencies */
diff --git a/src/libserver/rspamd_symcache.h b/src/libserver/rspamd_symcache.h
index afdda7e79..728b7636c 100644
--- a/src/libserver/rspamd_symcache.h
+++ b/src/libserver/rspamd_symcache.h
@@ -45,7 +45,6 @@ enum rspamd_symbol_type {
 	SYMBOL_TYPE_POSTFILTER = (1u << 10u),
 	SYMBOL_TYPE_NOSTAT = (1u << 11u), /* Skip as statistical symbol */
 	SYMBOL_TYPE_IDEMPOTENT = (1u << 12u), /* Symbol cannot change metric */
-	SYMBOL_TYPE_SQUEEZED = (1u << 13u), /* Symbol is squeezed inside Lua */
 	SYMBOL_TYPE_TRIVIAL = (1u << 14u), /* Symbol is trivial */
 	SYMBOL_TYPE_MIME_ONLY = (1u << 15u), /* Symbol is mime only */
 	SYMBOL_TYPE_EXPLICIT_DISABLE = (1u << 16u), /* Symbol should be disabled explicitly only */
diff --git a/src/lua/lua_config.c b/src/lua/lua_config.c
index cc0fa44ee..f2e9abd01 100644
--- a/src/lua/lua_config.c
+++ b/src/lua/lua_config.c
@@ -1365,101 +1365,6 @@ lua_metric_symbol_callback_return (struct thread_entry *thread_entry, int ret)
 	rspamd_symcache_item_async_dec_check (task, cd->item, "lua coro symbol");
 }
 
-static gint
-rspamd_lua_squeeze_rule (lua_State *L,
-						 struct rspamd_config *cfg,
-						 const gchar *name,
-						 gint cbref,
-						 enum rspamd_symbol_type type,
-						 gint parent)
-{
-	gint ret = -1, err_idx;
-
-	lua_pushcfunction (L, &rspamd_lua_traceback);
-	err_idx = lua_gettop (L);
-
-	if (type & SYMBOL_TYPE_VIRTUAL) {
-		if (rspamd_lua_require_function (L, "lua_squeeze_rules", "squeeze_virtual")) {
-			lua_pushnumber (L, parent);
-			if (name) {
-				lua_pushstring (L, name);
-			}
-			else {
-				lua_pushnil (L);
-			}
-
-			/* Now call for squeeze function */
-			if (lua_pcall (L, 2, 1, err_idx) != 0) {
-				msg_err_config ("call to squeeze_virtual failed: %s",
-						lua_tostring (L, -1));
*** OUTPUT TRUNCATED, 470 LINES SKIPPED ***


More information about the Commits mailing list