filestore: fix global counter init in unix socket mode

Move initialization of filestore global counter to PreRunInit,
so they get registered during program initialization, or as
required in unix-socket mode, initialized for each file run.

Fixes Redmine issue:
https://redmine.openinfosecfoundation.org/issues/4216
pull/5948/head
Jason Ish 6 years ago committed by Victor Julien
parent 8307010255
commit 0aed5e188b

@ -525,9 +525,6 @@ static OutputInitResult OutputFilestoreLogInitCtx(ConfNode *conf)
} }
} }
StatsRegisterGlobalCounter("file_store.open_files",
OutputFilestoreOpenFilesCounter);
result.ctx = output_ctx; result.ctx = output_ctx;
result.ok = true; result.ok = true;
SCReturnCT(result, "OutputInitResult"); SCReturnCT(result, "OutputInitResult");
@ -543,3 +540,8 @@ void OutputFilestoreRegister(void)
SC_ATOMIC_INIT(filestore_open_file_cnt); SC_ATOMIC_INIT(filestore_open_file_cnt);
SC_ATOMIC_SET(filestore_open_file_cnt, 0); SC_ATOMIC_SET(filestore_open_file_cnt, 0);
} }
void OutputFilestoreRegisterGlobalCounters(void)
{
StatsRegisterGlobalCounter("file_store.open_files", OutputFilestoreOpenFilesCounter);
}

@ -20,5 +20,6 @@
void OutputFilestoreRegister(void); void OutputFilestoreRegister(void);
void OutputFilestoreInitConfig(void); void OutputFilestoreInitConfig(void);
void OutputFilestoreRegisterGlobalCounters(void);
#endif /* __OUTPUT_FILESTORE_H__ */ #endif /* __OUTPUT_FILESTORE_H__ */

@ -125,6 +125,8 @@
#include "app-layer-smb.h" #include "app-layer-smb.h"
#include "app-layer-dcerpc.h" #include "app-layer-dcerpc.h"
#include "output-filestore.h"
#include "util-ebpf.h" #include "util-ebpf.h"
#include "util-radix-tree.h" #include "util-radix-tree.h"
#include "util-host-os-info.h" #include "util-host-os-info.h"
@ -2015,6 +2017,7 @@ void PreRunInit(const int runmode)
StreamTcpInitConfig(STREAM_VERBOSE); StreamTcpInitConfig(STREAM_VERBOSE);
AppLayerParserPostStreamSetup(); AppLayerParserPostStreamSetup();
AppLayerRegisterGlobalCounters(); AppLayerRegisterGlobalCounters();
OutputFilestoreRegisterGlobalCounters();
} }
/* tasks we need to run before packets start flowing, /* tasks we need to run before packets start flowing,

Loading…
Cancel
Save