diff options
author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-11-11 14:41:57 +0000 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2019-11-11 15:30:30 +0000 |
commit | 63800059e8dacc1ba69b623719c21355a77301c5 (patch) | |
tree | 4fa217e014f7932c547e1815e217c332f4611309 /src/worker.c | |
parent | 82ca7ec2ac7f02f67304e1ed7b6859cabdfeae22 (diff) | |
download | rspamd-63800059e8dacc1ba69b623719c21355a77301c5.tar.gz rspamd-63800059e8dacc1ba69b623719c21355a77301c5.zip |
[Rework] Further isolation of the controller's functions
Diffstat (limited to 'src/worker.c')
-rw-r--r-- | src/worker.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/worker.c b/src/worker.c index 193c74319..4279aa82c 100644 --- a/src/worker.c +++ b/src/worker.c @@ -507,7 +507,6 @@ start_worker (struct rspamd_worker *worker) ctx->resolver = rspamd_dns_resolver_init (worker->srv->logger, ctx->event_loop, worker->srv->cfg); - rspamd_map_watch (worker->srv->cfg, ctx->event_loop, ctx->resolver, worker, 0); rspamd_upstreams_library_config (worker->srv->cfg, ctx->cfg->ups_ctx, ctx->event_loop, ctx->resolver->r); @@ -548,6 +547,14 @@ start_worker (struct rspamd_worker *worker) } } + if (is_controller) { + rspamd_worker_init_controller (worker, NULL); + } + else { + rspamd_map_watch (worker->srv->cfg, ctx->event_loop, ctx->resolver, + worker, 0); + } + rspamd_lua_run_postloads (ctx->cfg->lua_state, ctx->cfg, ctx->event_loop, worker); @@ -555,7 +562,7 @@ start_worker (struct rspamd_worker *worker) rspamd_worker_block_signals (); if (is_controller) { - rspamd_controller_on_terminate ( + rspamd_controller_on_terminate (worker, NULL); } rspamd_stat_close (); |