diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-29 13:19:14 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2018-10-29 13:19:14 +0000 |
| commit | 34f0b5587e72a7f77425d9faccac8b03b363fdcc (patch) | |
| tree | 1a03c4c065315bdbdf02f47bfc6c9e64ab90e7d7 /src/controller.c | |
| parent | 8376bed06ce63da58256c383f1899f17094140d1 (diff) | |
| download | rspamd-34f0b5587e72a7f77425d9faccac8b03b363fdcc.tar.gz rspamd-34f0b5587e72a7f77425d9faccac8b03b363fdcc.zip | |
[Rework] Change time handling
Diffstat (limited to 'src/controller.c')
| -rw-r--r-- | src/controller.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/controller.c b/src/controller.c index 26d12e14b..6875e1f3e 100644 --- a/src/controller.c +++ b/src/controller.c @@ -1522,10 +1522,9 @@ rspamd_controller_handle_lua_history (lua_State *L, if (lua_isfunction (L, -1)) { task = rspamd_task_new (session->ctx->worker, session->cfg, - session->pool, ctx->lang_det); + session->pool, ctx->lang_det, ctx->ev_base); task->resolver = ctx->resolver; - task->ev_base = ctx->ev_base; task->s = rspamd_session_create (session->pool, rspamd_controller_history_lua_fin_task, NULL, @@ -1823,11 +1822,9 @@ rspamd_controller_handle_lua (struct rspamd_http_connection_entry *conn_ent, } task = rspamd_task_new (session->ctx->worker, session->cfg, session->pool, - ctx->lang_det); + ctx->lang_det, ctx->ev_base); task->resolver = ctx->resolver; - task->ev_base = ctx->ev_base; - task->s = rspamd_session_create (session->pool, rspamd_controller_lua_fin_task, NULL, @@ -2008,12 +2005,9 @@ rspamd_controller_handle_learn_common ( } task = rspamd_task_new (session->ctx->worker, session->cfg, session->pool, - session->ctx->lang_det); + session->ctx->lang_det, ctx->ev_base); task->resolver = ctx->resolver; - task->ev_base = ctx->ev_base; - - task->s = rspamd_session_create (session->pool, rspamd_controller_learn_fin_task, NULL, @@ -2109,12 +2103,9 @@ rspamd_controller_handle_scan (struct rspamd_http_connection_entry *conn_ent, } task = rspamd_task_new (session->ctx->worker, session->cfg, session->pool, - ctx->lang_det); - task->ev_base = session->ctx->ev_base; + ctx->lang_det, ctx->ev_base); task->resolver = ctx->resolver; - task->ev_base = ctx->ev_base; - task->s = rspamd_session_create (session->pool, rspamd_controller_check_fin_task, NULL, @@ -2600,9 +2591,8 @@ rspamd_controller_handle_stat_common ( ctx = session->ctx; task = rspamd_task_new (session->ctx->worker, session->cfg, session->pool, - ctx->lang_det); + ctx->lang_det, ctx->ev_base); task->resolver = ctx->resolver; - task->ev_base = ctx->ev_base; cbdata = rspamd_mempool_alloc0 (session->pool, sizeof (*cbdata)); cbdata->conn_ent = conn_ent; cbdata->task = task; @@ -2963,11 +2953,9 @@ rspamd_controller_handle_lua_plugin (struct rspamd_http_connection_entry *conn_e } task = rspamd_task_new (session->ctx->worker, session->cfg, session->pool, - ctx->lang_det); + ctx->lang_det, ctx->ev_base); task->resolver = ctx->resolver; - task->ev_base = ctx->ev_base; - task->s = rspamd_session_create (session->pool, rspamd_controller_lua_fin_task, NULL, |