From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Fri, 17 Apr 2015 13:42:45 +0000 (+0100)
Subject: Move more initialization from main.c.
X-Git-Tag: 0.9.0~219
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3cb21a049f62dff157a1f33e7bbd928d181b9ce0;p=rspamd.git

Move more initialization from main.c.
---

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);