From: Vsevolod Stakhov <vsevolod@rambler-co.ru>
Date: Wed, 30 Nov 2011 12:11:54 +0000 (+0300)
Subject: Expire an element if forced expire is required.
X-Git-Tag: 0.4.6~25
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2975827e40a8e7c6e820c42921fb8792cf637450;p=rspamd.git

Expire an element if forced expire is required.
---

diff --git a/src/kvstorage.c b/src/kvstorage.c
index 5ad076b3e..7c8b3ef80 100644
--- a/src/kvstorage.c
+++ b/src/kvstorage.c
@@ -132,7 +132,7 @@ rspamd_kv_storage_insert_cache (struct rspamd_kv_storage *storage, gpointer key,
 	}
 
 	storage->elts ++;
-	storage->memory += elt->size + sizeof (struct rspamd_kv_element);
+	storage->memory += ELT_SIZE (elt);
 	g_static_rw_lock_writer_unlock (&storage->rwlock);
 
 	return TRUE;
@@ -585,7 +585,7 @@ rspamd_lru_expire_step (struct rspamd_kv_expire *e, struct rspamd_kv_storage *st
 	elt = TAILQ_FIRST (&expire->head);
 	if (elt && (forced || (elt->flags & (KV_ELT_PERSISTENT|KV_ELT_DIRTY)) == 0)) {
 		diff = elt->expire - (now - elt->age);
-		if (diff > 0) {
+		if (diff > 0 || (forced && elt->expire == 0)) {
 			oldest_elt = elt;
 		}
 		else {