diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-07-22 17:02:10 +0100 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-07-22 17:02:10 +0100 |
commit | bc235cf8d945e58b9fe13d5d17973457f45b8480 (patch) | |
tree | 8ef44a1e1552881129d6708adf92a52e093c6340 /src/libstat/stat_process.c | |
parent | dd3b11704d96d23c5c41641c53657367282b45f1 (diff) | |
download | rspamd-bc235cf8d945e58b9fe13d5d17973457f45b8480.tar.gz rspamd-bc235cf8d945e58b9fe13d5d17973457f45b8480.zip |
Another iteration on #331.
Diffstat (limited to 'src/libstat/stat_process.c')
-rw-r--r-- | src/libstat/stat_process.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libstat/stat_process.c b/src/libstat/stat_process.c index 5318ab144..b5293f8ac 100644 --- a/src/libstat/stat_process.c +++ b/src/libstat/stat_process.c @@ -112,6 +112,8 @@ preprocess_init_stat_token (gpointer k, gpointer v, gpointer d) g_tree_nnodes (cbdata->tok->tokens), cl_runtime->clcf->min_tokens); cur = g_list_next (cur); + cl_runtime->skipped = TRUE; + continue; } @@ -429,6 +431,11 @@ rspamd_stat_classify (struct rspamd_task *task, lua_State *L, GError **err) cl_run = (struct rspamd_classifier_runtime *)cur->data; cl_run->stage = RSPAMD_STAT_STAGE_POST; + if (cl_run->skipped) { + cur = g_list_next (cur); + continue; + } + if (cl_run->cl) { if (cl_ctx != NULL) { if (cl_run->cl->classify_func (cl_ctx, cl_run->tok->tokens, @@ -442,7 +449,7 @@ rspamd_stat_classify (struct rspamd_task *task, lua_State *L, GError **err) while (curst) { st_run = curst->data; - st_run->backend->finalize_learn (task, + st_run->backend->finalize_process (task, st_run->backend_runtime, st_run->backend->ctx); curst = g_list_next (curst); @@ -598,7 +605,7 @@ rspamd_stat_learn (struct rspamd_task *task, gboolean spam, lua_State *L, while (cur) { cl_run = (struct rspamd_classifier_runtime *)cur->data; - if (cl_run->cl) { + if (cl_run->cl && !cl_run->skipped) { cl_ctx = cl_run->cl->init_func (task->task_pool, cl_run->clcf); if (cl_ctx != NULL) { |