aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2017-08-12 20:39:11 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2017-08-12 20:39:11 +0100
commite1445e75f907d3a7bf8f80a7e1039044b05794be (patch)
tree8206d575a2943fecc860f1da47305bbb1eccc76b
parent54c77a450d4a6dbf53c98406fa18dbc0a775caad (diff)
downloadrspamd-e1445e75f907d3a7bf8f80a7e1039044b05794be.tar.gz
rspamd-e1445e75f907d3a7bf8f80a7e1039044b05794be.zip
[Minor] Fix idempotent symbols processing
-rw-r--r--src/libserver/symbols_cache.c2
-rw-r--r--src/libutil/logger.h4
2 files changed, 2 insertions, 4 deletions
diff --git a/src/libserver/symbols_cache.c b/src/libserver/symbols_cache.c
index 4240ba652..3a8c4ee32 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 57ef74d09..ea7611cd6 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, \