diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-02-10 20:53:22 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2020-02-10 21:12:13 +0000 |
| commit | 3424122c9d082d53e8c437066d34cf602380a69c (patch) | |
| tree | 85bd4b9503d3a903a55996c3c646f0c4c28195f8 /src/libserver | |
| parent | 7630467d757c27fab944cda366e78ac82d45ff55 (diff) | |
| download | rspamd-3424122c9d082d53e8c437066d34cf602380a69c.tar.gz rspamd-3424122c9d082d53e8c437066d34cf602380a69c.zip | |
[Rework] Logger: Fix issues found so far
Diffstat (limited to 'src/libserver')
| -rw-r--r-- | src/libserver/worker_util.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c index c835a4dbd..ebc6a1980 100644 --- a/src/libserver/worker_util.c +++ b/src/libserver/worker_util.c @@ -305,7 +305,7 @@ rspamd_worker_usr1_handler (struct rspamd_worker_signal_handler *sigh, void *arg { struct rspamd_main *rspamd_main = sigh->worker->srv; - rspamd_log_reopen (sigh->worker->srv->logger); + rspamd_log_reopen (sigh->worker->srv->logger, rspamd_main->cfg, -1, -1); msg_info_main ("logging reinitialised"); /* Get more signals */ @@ -996,9 +996,7 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main, switch (wrk->pid) { case 0: /* Update pid for logging */ - rspamd_log_update_pid (cf->type, rspamd_main->logger); - /* To avoid atomic writes issue */ - rspamd_log_reopen (rspamd_main->logger); + rspamd_log_on_fork (cf->type, rspamd_main->cfg, rspamd_main->logger); wrk->pid = getpid (); /* Init PRNG after fork */ @@ -1047,17 +1045,10 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main, rspamd_pidfile_close (rspamd_main->pfh); } - /* Do silent log reopen to avoid collisions */ - rspamd_log_close (rspamd_main->logger, FALSE); - - if (rspamd_main->cfg->log_silent_workers) { - rspamd_main->cfg->log_level = G_LOG_LEVEL_MESSAGE; - rspamd_set_logger (rspamd_main->cfg, cf->type, - &rspamd_main->logger, rspamd_main->server_pool); + rspamd_log_set_log_level (rspamd_main->logger, G_LOG_LEVEL_MESSAGE); } - rspamd_log_open (rspamd_main->logger); wrk->start_time = rspamd_get_calendar_ticks (); if (cf->bind_conf) { @@ -1075,8 +1066,9 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main, rspamd_socket_nonblocking (wrk->control_pipe[1]); rspamd_socket_nonblocking (wrk->srv_pipe[1]); rspamd_main->cfg->cur_worker = wrk; - /* Execute worker */ + /* Execute worker (this function should not return normally!) */ cf->worker->worker_start_func (wrk); + /* To distinguish from normal termination */ exit (EXIT_FAILURE); break; case -1: @@ -1167,7 +1159,7 @@ rspamd_hard_terminate (struct rspamd_main *rspamd_main) msg_err_main ("shutting down Rspamd due to fatal error"); - rspamd_log_close (rspamd_main->logger, TRUE); + rspamd_log_close (rspamd_main->logger); exit (EXIT_FAILURE); } |