diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-07-20 18:42:29 +0100 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2013-07-20 18:42:29 +0100 |
| commit | 8abd76b18ff391376fff2f6652a7f9711d7766d2 (patch) | |
| tree | f0467d461f4fccb1c2dfe30b0f19ad4f15d98129 /src/smtp.c | |
| parent | 7522608cb80dc227c05f4e254ba13e9f86d7a07f (diff) | |
| download | rspamd-8abd76b18ff391376fff2f6652a7f9711d7766d2.tar.gz rspamd-8abd76b18ff391376fff2f6652a7f9711d7766d2.zip | |
Allow listening on multiply addresses.
Now rspamd can listen on multiply ipv4/ipv6 addresses.
Removed legacy workers (lmtp, kvstorage) as they are never used
in production.
Try to unify workers initialization.
Diffstat (limited to 'src/smtp.c')
| -rw-r--r-- | src/smtp.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/smtp.c b/src/smtp.c index 075e1b663..f4033c954 100644 --- a/src/smtp.c +++ b/src/smtp.c @@ -61,7 +61,8 @@ worker_t smtp_worker = { TRUE, /* Has socket */ FALSE, /* Non unique */ FALSE, /* Non threaded */ - TRUE /* Killable */ + TRUE, /* Killable */ + SOCK_STREAM /* TCP socket */ }; #ifndef HAVE_SA_SIGINFO @@ -105,7 +106,7 @@ sigusr2_handler (gint fd, short what, void *arg) tv.tv_usec = 0; event_del (&worker->sig_ev_usr1); event_del (&worker->sig_ev_usr2); - event_del (&worker->bind_ev); + worker_stop_accept (worker); msg_info ("worker's shutdown is pending in %d sec", SOFT_SHUTDOWN_TIME); event_loopexit (&tv); } @@ -944,13 +945,10 @@ config_smtp_worker (struct rspamd_worker *worker) void start_smtp (struct rspamd_worker *worker) { - struct sigaction signals; struct smtp_worker_ctx *ctx = worker->ctx; - gperf_profiler_init (worker->srv->cfg, "worker"); + ctx->ev_base = prepare_worker (worker, "smtp_worker", sig_handler, accept_socket); - worker->srv->pid = getpid (); - ctx->ev_base = event_init (); /* Set smtp options */ if ( !config_smtp_worker (worker)) { @@ -958,9 +956,6 @@ start_smtp (struct rspamd_worker *worker) exit (EXIT_SUCCESS); } - init_signals (&signals, sig_handler); - sigprocmask (SIG_UNBLOCK, &signals.sa_mask, NULL); - /* SIGUSR2 handler */ signal_set (&worker->sig_ev_usr2, SIGUSR2, sigusr2_handler, (void *) worker); event_base_set (ctx->ev_base, &worker->sig_ev_usr2); @@ -971,11 +966,6 @@ start_smtp (struct rspamd_worker *worker) event_base_set (ctx->ev_base, &worker->sig_ev_usr1); signal_add (&worker->sig_ev_usr1, NULL); - /* Accept event */ - event_set (&worker->bind_ev, worker->cf->listen_sock, EV_READ | EV_PERSIST, accept_socket, (void *)worker); - event_base_set (ctx->ev_base, &worker->bind_ev); - event_add (&worker->bind_ev, NULL); - /* Maps events */ start_map_watch (worker->srv->cfg, ctx->ev_base); |