From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Thu, 9 Jul 2015 08:31:33 +0000 (+0100)
Subject: Move statistics initialization to start of workers.
X-Git-Tag: 1.0.0~410
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65c174b0c308cdfcb50830279a6cbea0a6d00073;p=thirdparty%2Frspamd.git

Move statistics initialization to start of workers.
---

diff --git a/src/controller.c b/src/controller.c
index aa45f5c912..5f87101324 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -1966,6 +1966,7 @@ start_controller_worker (struct rspamd_worker *worker)
 	/* Maps events */
 	rspamd_map_watch (worker->srv->cfg, ctx->ev_base);
 	rspamd_symbols_cache_start_refresh (worker->srv->cfg->cache, ctx->ev_base);
+	rspamd_stat_init (worker->srv->cfg);
 
 	event_base_loop (ctx->ev_base, 0);
 
diff --git a/src/libserver/cfg_utils.c b/src/libserver/cfg_utils.c
index 1ba6b2555e..0c9e51ed86 100644
--- a/src/libserver/cfg_utils.c
+++ b/src/libserver/cfg_utils.c
@@ -411,7 +411,6 @@ rspamd_config_post_load (struct rspamd_config *cfg)
 	(void)rspamd_lua_post_load_config (cfg);
 	init_dynamic_config (cfg);
 
-	rspamd_stat_init (cfg);
 	rspamd_url_init (cfg->tld_file);
 
 	/* Insert classifiers symbols */
diff --git a/src/main.c b/src/main.c
index dfd6182d81..58fc3f7e6b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1361,7 +1361,6 @@ main (gint argc, gchar **argv, gchar **env)
 
 	msg_info ("terminating...");
 	rspamd_symbols_cache_destroy (rspamd_main->cfg->cache);
-	rspamd_stat_close ();
 	rspamd_log_close (rspamd_main->logger);
 	rspamd_config_free (rspamd_main->cfg);
 	g_free (rspamd_main->cfg);
diff --git a/src/worker.c b/src/worker.c
index ba322d51e6..b935accf44 100644
--- a/src/worker.c
+++ b/src/worker.c
@@ -37,6 +37,7 @@
 #include "libmime/message.h"
 #include "main.h"
 #include "keypairs_cache.h"
+#include "libstat/stat_api.h"
 
 #include "lua/lua_common.h"
 
@@ -301,6 +302,7 @@ start_worker (struct rspamd_worker *worker)
 
 	/* XXX: stupid default */
 	ctx->keys_cache = rspamd_keypair_cache_new (256);
+	rspamd_stat_init (worker->srv->cfg);
 
 	event_base_loop (ctx->ev_base, 0);