]> source.dussan.org Git - rspamd.git/commitdiff
[Minor] Fix idempotent symbols processing
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 12 Aug 2017 19:39:11 +0000 (20:39 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Sat, 12 Aug 2017 19:39:11 +0000 (20:39 +0100)
src/libserver/symbols_cache.c
src/libutil/logger.h

index 4240ba652fa7cd13df2e312f22334431d199a965..3a8c4ee3221e8d6d2b81e041a64ce553b799e1bf 100644 (file)
@@ -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 ||
index 57ef74d09b446a3072f19b01e3a1a77880facbd8..ea7611cd69a2327e6b0bdd1d060cfb76fdd7f0ac 100644 (file)
@@ -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, \