]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
stats: initialize after outputs
authorVictor Julien <victor@inliniac.net>
Tue, 4 Nov 2014 09:34:28 +0000 (10:34 +0100)
committerVictor Julien <victor@inliniac.net>
Wed, 3 Dec 2014 10:40:16 +0000 (11:40 +0100)
Initialize stats after outputs so that we can check if we need to
initialize the stats api at all.

src/runmode-unix-socket.c
src/suricata.c

index ec53b3f6fffdd65f552503882f79b30b3d12223a..d8d55a10d8fd162397f9512e4dd84ee9af93c6bc 100644 (file)
@@ -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();
index e7053ab965028771533be6d6429c7dbaaf3496c6..c9a2084a953d6bfd01b176002412bd680a676df8 100644 (file)
@@ -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) {