From: Victor Julien <victor@inliniac.net>
Date: Tue, 4 Nov 2014 09:34:28 +0000 (+0100)
Subject: stats: initialize after outputs
X-Git-Tag: suricata-2.1beta3~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6252d24e0b45f57b8e5545c41292aa41863147a6;p=thirdparty%2Fsuricata.git

stats: initialize after outputs

Initialize stats after outputs so that we can check if we need to
initialize the stats api at all.
---

diff --git a/src/runmode-unix-socket.c b/src/runmode-unix-socket.c
index ec53b3f6ff..d8d55a10d8 100644
--- a/src/runmode-unix-socket.c
+++ b/src/runmode-unix-socket.c
@@ -334,11 +334,11 @@ TmEcode UnixSocketPcapFilesCheck(void *data)
             return TM_ECODE_FAILED;
         }
         PcapFilesFree(cfile);
-        SCPerfInitCounterApi();
         DefragInit();
         FlowInitConfig(FLOW_QUIET);
         StreamTcpInitConfig(STREAM_VERBOSE);
         RunModeInitializeOutputs();
+        SCPerfInitCounterApi();
         RunModeDispatch(RUNMODE_PCAP_FILE, NULL, this->de_ctx);
         FlowManagerThreadSpawn();
         FlowRecyclerThreadSpawn();
diff --git a/src/suricata.c b/src/suricata.c
index e7053ab965..c9a2084a95 100644
--- a/src/suricata.c
+++ b/src/suricata.c
@@ -2073,10 +2073,6 @@ static int PostConfLoadedSetup(SCInstance *suri)
     StorageInit();
     CIDRInit();
     SigParsePrepare();
-    //PatternMatchPrepare(mpm_ctx, MPM_B2G);
-    if (suri->run_mode != RUNMODE_UNIX_SOCKET) {
-        SCPerfInitCounterApi();
-    }
 #ifdef PROFILING
     SCProfilingRulesGlobalInit();
     SCProfilingKeywordsGlobalInit();
@@ -2287,6 +2283,7 @@ int main(int argc, char **argv)
 
     if (suri.run_mode != RUNMODE_UNIX_SOCKET) {
         RunModeInitializeOutputs();
+        SCPerfInitCounterApi();
     }
 
     if (ParseInterfacesList(suri.run_mode, suri.pcap_dev) != TM_ECODE_OK) {