logging: convert json netflow output to non-thread module

diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c
index e131588bb6fa1dc9ac7c7c3eb01c66208b6531ec..2091be08d8967aca5abfd181ce80b30b32cb44c5 100644 (file)
--- a/src/output-json-netflow.c
+++ b/src/output-json-netflow.c
@@ -432,34 +432,22 @@ static TmEcode JsonNetFlowLogThreadDeinit(ThreadVars *t, void *data)
 
 void TmModuleJsonNetFlowLogRegister (void)
 {
-    tmm_modules[TMM_JSONNETFLOWLOG].name = "JsonNetFlowLog";
-    tmm_modules[TMM_JSONNETFLOWLOG].ThreadInit = JsonNetFlowLogThreadInit;
-    tmm_modules[TMM_JSONNETFLOWLOG].ThreadDeinit = JsonNetFlowLogThreadDeinit;
-    tmm_modules[TMM_JSONNETFLOWLOG].RegisterTests = NULL;
-    tmm_modules[TMM_JSONNETFLOWLOG].cap_flags = 0;
-    tmm_modules[TMM_JSONNETFLOWLOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* register as separate module */
     OutputRegisterFlowModule("JsonNetFlowLog", "netflow-json-log",
-            OutputNetFlowLogInit, JsonNetFlowLogger, NULL, NULL, NULL);
+        OutputNetFlowLogInit, JsonNetFlowLogger, JsonNetFlowLogThreadInit,
+        JsonNetFlowLogThreadDeinit, NULL);
 
     /* also register as child of eve-log */
     OutputRegisterFlowSubModule("eve-log", "JsonNetFlowLog", "eve-log.netflow",
-            OutputNetFlowLogInitSub, JsonNetFlowLogger, NULL, NULL, NULL);
+        OutputNetFlowLogInitSub, JsonNetFlowLogger, JsonNetFlowLogThreadInit,
+        JsonNetFlowLogThreadDeinit, NULL);
 }
 
 #else
 
-static TmEcode OutputJsonThreadInit(ThreadVars *t, void *initdata, void **data)
-{
-    SCLogInfo("Can't init JSON output - JSON support was disabled during build.");
-    return TM_ECODE_FAILED;
-}
-
 void TmModuleJsonNetFlowLogRegister (void)
 {
-    tmm_modules[TMM_JSONNETFLOWLOG].name = "JsonNetFlowLog";
-    tmm_modules[TMM_JSONNETFLOWLOG].ThreadInit = OutputJsonThreadInit;
+    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif

diff --git a/src/tm-modules.c b/src/tm-modules.c
index 67a97767ac2a43ce5193fd785d95e7ca27495dea..1d1040fcda206901efe3ee5e4e3c720f37cea016 100644 (file)
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -244,7 +244,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_STREAMINGLOGGER);
         CASE_CODE (TMM_JSONDROPLOG);
         CASE_CODE (TMM_JSONFILELOG);
-        CASE_CODE (TMM_JSONNETFLOWLOG);
         CASE_CODE (TMM_JSONSMTPLOG);
         CASE_CODE (TMM_JSONSSHLOG);
         CASE_CODE (TMM_JSONSTATSLOG);

diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 9a980ed73677571d301b09e03c7e8efc80bd3fd0..7739146e669d664c98131d27a1872b29d1072c49 100644 (file)
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -82,7 +82,6 @@ typedef enum {
     TMM_JSONFILELOG,
     TMM_RECEIVENFLOG,
     TMM_DECODENFLOG,
-    TMM_JSONNETFLOWLOG,
     TMM_LOGSTATSLOG,
     TMM_JSONTEMPLATELOG,