@@ -1136,7 +1136,8 @@ rspamd_rcl_composite_handler (rspamd_mempool_t *pool, | |||
composite); | |||
if (new) { | |||
rspamd_symbols_cache_add_symbol_virtual (cfg->cache, composite_name, 1); | |||
rspamd_symbols_cache_add_symbol (cfg->cache, composite_name, 1, 0, | |||
NULL, NULL, SYMBOL_TYPE_COMPOSITE, -1); | |||
} | |||
return TRUE; |
@@ -680,7 +680,9 @@ symbols_classifiers_callback (gpointer key, gpointer value, gpointer ud) | |||
{ | |||
struct rspamd_config *cfg = ud; | |||
rspamd_symbols_cache_add_symbol_virtual (cfg->cache, key, 1.0); | |||
/* Actually, statistics should act like any ordinary symbol */ | |||
rspamd_symbols_cache_add_symbol (cfg->cache, key, 1.0, 0, NULL, NULL, | |||
SYMBOL_TYPE_COMPOSITE, -1); | |||
} | |||
void |
@@ -673,6 +673,7 @@ rspamd_symbols_cache_process_symbol (struct rspamd_task * task, | |||
} | |||
if (item->type == SYMBOL_TYPE_NORMAL || item->type == SYMBOL_TYPE_CALLBACK) { | |||
g_assert (item->func != NULL); | |||
t1 = rspamd_get_ticks (); | |||
if (item->symbol != NULL && |
@@ -41,7 +41,8 @@ enum rspamd_symbol_type { | |||
SYMBOL_TYPE_VIRTUAL, | |||
SYMBOL_TYPE_CALLBACK, | |||
SYMBOL_TYPE_GHOST, | |||
SYMBOL_TYPE_SKIPPED | |||
SYMBOL_TYPE_SKIPPED, | |||
SYMBOL_TYPE_COMPOSITE | |||
}; | |||
/** |
@@ -212,8 +212,8 @@ rspamd_lua_post_load_config (struct rspamd_config *cfg) | |||
} | |||
else { | |||
g_hash_table_insert (cfg->composite_symbols, sym, expr); | |||
rspamd_symbols_cache_add_symbol_virtual (cfg->cache, sym, | |||
1, -1); | |||
rspamd_symbols_cache_add_symbol (cfg->cache, sym, | |||
1, 0, NULL, NULL, SYMBOL_TYPE_COMPOSITE, -1); | |||
} | |||
} | |||
} |
@@ -1191,8 +1191,8 @@ lua_config_add_composite (lua_State * L) | |||
composite); | |||
if (new) { | |||
rspamd_symbols_cache_add_symbol_virtual (cfg->cache, name, | |||
1, -1); | |||
rspamd_symbols_cache_add_symbol (cfg->cache, name, | |||
1, 0, NULL, NULL, SYMBOL_TYPE_COMPOSITE, -1); | |||
} | |||
ret = TRUE; |