From: Jason Ish <ish@unx.ca>
Date: Fri, 27 May 2016 08:05:30 +0000 (-0600)
Subject: logging: convert json drop output to non-thread module
X-Git-Tag: suricata-3.2beta1~377
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bac65f09e8aa810c9768e0f814e0e3d9c841b564;p=thirdparty%2Fsuricata.git

logging: convert json drop output to non-thread module
---

diff --git a/src/output-json-drop.c b/src/output-json-drop.c
index 8a9a0610c6..c7a8b18b85 100644
--- a/src/output-json-drop.c
+++ b/src/output-json-drop.c
@@ -429,30 +429,19 @@ static int JsonDropLogCondition(ThreadVars *tv, const Packet *p)
 
 void TmModuleJsonDropLogRegister (void)
 {
-    tmm_modules[TMM_JSONDROPLOG].name = MODULE_NAME;
-    tmm_modules[TMM_JSONDROPLOG].ThreadInit = JsonDropLogThreadInit;
-    tmm_modules[TMM_JSONDROPLOG].ThreadDeinit = JsonDropLogThreadDeinit;
-    tmm_modules[TMM_JSONDROPLOG].cap_flags = 0;
-    tmm_modules[TMM_JSONDROPLOG].flags = TM_FLAG_LOGAPI_TM;
-
     OutputRegisterPacketModule(MODULE_NAME, "drop-json-log",
-        JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition, NULL, NULL, NULL);
+        JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition,
+        JsonDropLogThreadInit, JsonDropLogThreadDeinit, NULL);
     OutputRegisterPacketSubModule("eve-log", MODULE_NAME, "eve-log.drop",
-        JsonDropLogInitCtxSub, JsonDropLogger, JsonDropLogCondition, NULL, NULL, NULL);
+        JsonDropLogInitCtxSub, JsonDropLogger, JsonDropLogCondition,
+        JsonDropLogThreadInit, JsonDropLogThreadDeinit, 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 TmModuleJsonDropLogRegister (void)
 {
-    tmm_modules[TMM_JSONDROPLOG].name = MODULE_NAME;
-    tmm_modules[TMM_JSONDROPLOG].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 dc5527cd5f..c8fbd57681 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -242,7 +242,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_FILELOGGER);
         CASE_CODE (TMM_FILEDATALOGGER);
         CASE_CODE (TMM_STREAMINGLOGGER);
-        CASE_CODE (TMM_JSONDROPLOG);
         CASE_CODE (TMM_JSONFILELOG);
         CASE_CODE (TMM_JSONSTATSLOG);
         CASE_CODE (TMM_OUTPUTJSON);
diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 736eb99871..3323faab44 100644
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -75,7 +75,6 @@ typedef enum {
     TMM_FILELOGGER,
     TMM_FILEDATALOGGER,
     TMM_STREAMINGLOGGER,
-    TMM_JSONDROPLOG,
     TMM_JSONSTATSLOG,
     TMM_JSONFILELOG,
     TMM_RECEIVENFLOG,