From 150915d96eb1f2e0fb6709276e2209b0b00a5cfe Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Wed, 11 Sep 2013 12:47:20 +0100 Subject: [PATCH] Correctly process skipped messages. --- src/filter.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/filter.c b/src/filter.c index 44fc16a07..70857ee04 100644 --- a/src/filter.c +++ b/src/filter.c @@ -262,18 +262,14 @@ process_filters (struct worker_task *task) struct metric *metric; gpointer item = NULL; - /* Check skip */ - if (check_skip (task->cfg->views, task)) { - task->is_skipped = TRUE; - task->state = WRITE_REPLY; - msg_info ("disable check for message id <%s>, view wants spam", task->message_id); - return 1; - } /* Check want spam setting */ - if (check_want_spam (task)) { + if (check_skip (task->cfg->views, task) || check_want_spam (task)) { task->is_skipped = TRUE; task->state = WRITE_REPLY; msg_info ("disable check for message id <%s>, user wants spam", task->message_id); + task->s->wanna_die = TRUE; + check_session_pending (task->s); + return 1; } -- 2.39.5