diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-27 20:31:00 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2017-11-27 20:31:42 +0000 |
| commit | 9fa822ae888ab3ac6e99e458a254ea1083d818a1 (patch) | |
| tree | 86912649890b8420542de2bcae7992afbf1261de /src | |
| parent | 038baee6c9fcb560e11603d5219e18eac2973233 (diff) | |
| download | rspamd-9fa822ae888ab3ac6e99e458a254ea1083d818a1.tar.gz rspamd-9fa822ae888ab3ac6e99e458a254ea1083d818a1.zip | |
[Fix] Move composites second pass to the dedicated stage
Diffstat (limited to 'src')
| -rw-r--r-- | src/libserver/task.c | 5 | ||||
| -rw-r--r-- | src/libserver/task.h | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/libserver/task.c b/src/libserver/task.c index 7fc6728e8..bf66ec030 100644 --- 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 194003e72..8ab9514ce 100644 --- 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 | \ |