diff options
author | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-04-27 18:43:22 +0400 |
---|---|---|
committer | Vsevolod Stakhov <vsevolod@rambler-co.ru> | 2010-04-27 18:43:22 +0400 |
commit | 02a6d987bbdf55e06375544a14c046d1724f946e (patch) | |
tree | dae44cce3c62f56794fb4245ac86020f27ea7591 /src/main.c | |
parent | 971bad45c44cf430bde13faede56699ba0381e83 (diff) | |
download | rspamd-02a6d987bbdf55e06375544a14c046d1724f946e.tar.gz rspamd-02a6d987bbdf55e06375544a14c046d1724f946e.zip |
* Improve logging system:
- do not write many repeated messages to log
- add process name to log line
* Small fixes to FreeBSD port and to start script as we have xml version now
* Reconfig modules while rereading config file
Diffstat (limited to 'src/main.c')
-rw-r--r-- | src/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c index 123a69940..522af5736 100644 --- a/src/main.c +++ b/src/main.c @@ -236,7 +236,7 @@ drop_priv (struct config_file *cfg) static void config_logger (struct rspamd_main *rspamd, gboolean is_fatal) { - rspamd_set_logger (rspamd->cfg->log_type, rspamd->cfg); + rspamd_set_logger (rspamd->cfg->log_type, RSPAMD_MAIN, rspamd->cfg); if (open_log () == -1) { if (is_fatal) { fprintf (stderr, "Fatal error, cannot open logfile, exiting\n"); @@ -284,7 +284,7 @@ reread_config (struct rspamd_main *rspamd) while (l) { filt = l->data; if (filt->module) { - (void)filt->module->module_config_func (rspamd->cfg); + (void)filt->module->module_reconfig_func (rspamd->cfg); } l = g_list_next (l); } @@ -336,7 +336,7 @@ fork_worker (struct rspamd_main *rspamd, struct worker_conf *cf) switch (cur->pid) { case 0: /* Update pid for logging */ - update_log_pid (); + update_log_pid (cf->type); /* Drop privilleges */ drop_priv (rspamd->cfg); /* Set limits */ @@ -781,7 +781,7 @@ main (int argc, char **argv, char **env) #endif /* First set logger to console logger */ - rspamd_set_logger (RSPAMD_LOG_CONSOLE, rspamd->cfg); + rspamd_set_logger (RSPAMD_LOG_CONSOLE, RSPAMD_MAIN, rspamd->cfg); (void)open_log (); g_log_set_default_handler (rspamd_glib_log_function, rspamd->cfg); |