[Fix] Move composites second pass to the dedicated stage

diff --git a/src/libserver/task.c b/src/libserver/task.c
index 7fc6728e8307d4982a8fb381e69eb37175fd5f8f..bf66ec030dc80338f0e60262d4aff3fae5ed4425 100644 (file)
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -784,10 +784,11 @@ rspamd_task_process (struct rspamd_task *task, guint stages)
                        }
                }
                break;
-
-       case RSPAMD_TASK_STAGE_IDEMPOTENT:
+       case RSPAMD_TASK_STAGE_COMPOSITES_POST:
                /* Second run of composites processing before idempotent filters */
                rspamd_make_composites (task);
+               break;
+       case RSPAMD_TASK_STAGE_IDEMPOTENT:
                rspamd_symbols_cache_process_symbols (task, task->cfg->cache,
                                RSPAMD_TASK_STAGE_IDEMPOTENT);
                break;

diff --git a/src/libserver/task.h b/src/libserver/task.h
index 194003e7235cb904df8b46fff186961022cf05e1..8ab9514ce585e22cdd00769cc9276ac239c1d202 100644 (file)
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -50,9 +50,10 @@ enum rspamd_task_stage {
        RSPAMD_TASK_STAGE_LEARN_PRE = (1 << 10),
        RSPAMD_TASK_STAGE_LEARN = (1 << 11),
        RSPAMD_TASK_STAGE_LEARN_POST = (1 << 12),
-       RSPAMD_TASK_STAGE_IDEMPOTENT = (1 << 13),
-       RSPAMD_TASK_STAGE_DONE = (1 << 14),
-       RSPAMD_TASK_STAGE_REPLIED = (1 << 15)
+       RSPAMD_TASK_STAGE_COMPOSITES_POST = (1 << 13),
+       RSPAMD_TASK_STAGE_IDEMPOTENT = (1 << 14),
+       RSPAMD_TASK_STAGE_DONE = (1 << 15),
+       RSPAMD_TASK_STAGE_REPLIED = (1 << 16)
 };
 
 #define RSPAMD_TASK_PROCESS_ALL (RSPAMD_TASK_STAGE_CONNECT | \
@@ -68,6 +69,7 @@ enum rspamd_task_stage {
                RSPAMD_TASK_STAGE_LEARN_PRE | \
                RSPAMD_TASK_STAGE_LEARN | \
                RSPAMD_TASK_STAGE_LEARN_POST | \
+               RSPAMD_TASK_STAGE_COMPOSITES_POST | \
                RSPAMD_TASK_STAGE_IDEMPOTENT | \
                RSPAMD_TASK_STAGE_DONE)
 #define RSPAMD_TASK_PROCESS_LEARN (RSPAMD_TASK_STAGE_CONNECT | \