Move more initialization from main.c.

diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 510a6661a68e43036f7b030baea8ed6468b09272..28310da5736567a20c6ba94a2c83f394cee1cfbd 100644 (file)
--- 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 2b70106d5e6ee3b8cd806cba980e35f4659cc12e..0b0a5628c277bc2e65ce88e43f9339d8341d4dc7 100644 (file)
--- 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);