From 3cb21a049f62dff157a1f33e7bbd928d181b9ce0 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Fri, 17 Apr 2015 14:42:45 +0100 Subject: [PATCH] Move more initialization from main.c. --- src/libserver/cfg_utils.c | 7 +++++++ src/main.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c index 510a6661a..28310da57 100644 --- a/src/libserver/cfg_utils.c +++ b/src/libserver/cfg_utils.c @@ -34,6 +34,7 @@ #include "map.h" #include "dynamic_cfg.h" #include "utlist.h" +#include "stat_api.h" #define DEFAULT_SCORE 10.0 @@ -385,6 +386,12 @@ rspamd_config_post_load (struct rspamd_config *cfg) /* Lua options */ (void)rspamd_lua_post_load_config (cfg); init_dynamic_config (cfg); + + rspamd_stat_init (rspamd_main->cfg); + rspamd_url_init (rspamd_main->cfg->tld_file); + + /* Insert classifiers symbols */ + (void)rspamd_config_insert_classify_symbols (rspamd_main->cfg); } #if 0 diff --git a/src/main.c b/src/main.c index 2b70106d5..0b0a5628c 100644 --- a/src/main.c +++ b/src/main.c @@ -1224,12 +1224,6 @@ main (gint argc, gchar **argv, gchar **env) setproctitle ("main process"); - rspamd_stat_init (rspamd_main->cfg); - rspamd_url_init (rspamd_main->cfg->tld_file); - - /* Insert classifiers symbols */ - (void)rspamd_config_insert_classify_symbols (rspamd_main->cfg); - /* Init config cache */ init_cfg_cache (rspamd_main->cfg); -- 2.39.5