From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 3 Mar 2017 12:34:11 +0000 (+0000)
Subject: [Fix] Do not resort cache on each check
X-Git-Tag: 1.5.2~41
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=46f91e3e37f7e698e6070e5ef337e3dc1142a804;p=rspamd.git

[Fix] Do not resort cache on each check
---

diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index 42232b9ec..5b532b979 100644
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -357,8 +357,7 @@ rspamd_symbols_cache_resort (struct symbols_cache *cache)
 		it = g_ptr_array_index (cache->items_by_id, i);
 		total_hits += it->st->total_hits;
 
-		if (!(it->type & (SYMBOL_TYPE_PREFILTER|SYMBOL_TYPE_POSTFILTER
-				|SYMBOL_TYPE_COMPOSITE|SYMBOL_TYPE_CLASSIFIER))) {
+		if (!(it->type & (SYMBOL_TYPE_PREFILTER|SYMBOL_TYPE_POSTFILTER|SYMBOL_TYPE_COMPOSITE))) {
 			g_ptr_array_add (ord->d, it);
 		}
 	}
@@ -1656,6 +1655,10 @@ rspamd_symbols_cache_process_symbols (struct rspamd_task * task,
 		for (i = 0; i < (gint)checkpoint->version; i ++) {
 			item = g_ptr_array_index (checkpoint->order->d, i);
 
+			if (item->type & SYMBOL_TYPE_CLASSIFIER) {
+				continue;
+			}
+
 			if (!(item->type & SYMBOL_TYPE_FINE) &&
 					rspamd_session_events_pending (task->s) == 0) {
 				if (rspamd_symbols_cache_metric_limit (task, checkpoint)) {