From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 12 Aug 2017 19:39:11 +0000 (+0100)
Subject: [Minor] Fix idempotent symbols processing
X-Git-Tag: 1.7.0~730
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1445e75f907d3a7bf8f80a7e1039044b05794be;p=thirdparty%2Frspamd.git

[Minor] Fix idempotent symbols processing
---

diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index 4240ba652f..3a8c4ee322 100644
--- a/src/libserver/symbols_cache.c
+++ b/src/libserver/symbols_cache.c
@@ -1850,8 +1850,6 @@ rspamd_symbols_cache_process_symbols (struct rspamd_task * task,
 
 		if (all_done) {
 			checkpoint->pass = RSPAMD_CACHE_PASS_IDEMPOTENT;
-
-			return TRUE;
 		}
 
 		if (checkpoint->waitq->len == 0 ||
diff --git a/src/libutil/logger.h b/src/libutil/logger.h
index 57ef74d09b..ea7611cd69 100644
--- a/src/libutil/logger.h
+++ b/src/libutil/logger.h
@@ -181,7 +181,7 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger);
         __VA_ARGS__)
 #define debug_task(...) rspamd_conditional_debug (NULL, \
         task->from_addr, \
-        task->task_pool->tag.tagname, task->task_pool->tag.uid, \
+        "task", task->task_pool->tag.uid, \
         G_STRFUNC, \
         __VA_ARGS__)
 
@@ -199,7 +199,7 @@ ucl_object_t * rspamd_log_errorbuf_export (const rspamd_logger_t *logger);
         G_STRFUNC, \
         __VA_ARGS__)
 #define msg_debug_task(...)  rspamd_default_log_function (G_LOG_LEVEL_DEBUG, \
-        task->task_pool->tag.tagname, task->task_pool->tag.uid, \
+        "task", task->task_pool->tag.uid, \
         G_STRFUNC, \
         __VA_ARGS__)
 #define msg_err_task_encrypted(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL|RSPAMD_LOG_ENCRYPTED, \