logging: convert eve http to non-thread module

diff --git a/src/output-json-http.c b/src/output-json-http.c
index 1ded557892f241bce23aab65f6f9e190982f2694..fdf03a33f6f0326ec5fea33790aa63d3ac97363b 100644 (file)
--- a/src/output-json-http.c
+++ b/src/output-json-http.c
@@ -584,34 +584,22 @@ static TmEcode JsonHttpLogThreadDeinit(ThreadVars *t, void *data)
 
 void TmModuleJsonHttpLogRegister (void)
 {
-    tmm_modules[TMM_JSONHTTPLOG].name = "JsonHttpLog";
-    tmm_modules[TMM_JSONHTTPLOG].ThreadInit = JsonHttpLogThreadInit;
-    tmm_modules[TMM_JSONHTTPLOG].ThreadDeinit = JsonHttpLogThreadDeinit;
-    tmm_modules[TMM_JSONHTTPLOG].RegisterTests = NULL;
-    tmm_modules[TMM_JSONHTTPLOG].cap_flags = 0;
-    tmm_modules[TMM_JSONHTTPLOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* register as separate module */
     OutputRegisterTxModule("JsonHttpLog", "http-json-log", OutputHttpLogInit,
-        ALPROTO_HTTP, JsonHttpLogger, NULL, NULL, NULL);
+        ALPROTO_HTTP, JsonHttpLogger, JsonHttpLogThreadInit,
+        JsonHttpLogThreadDeinit, NULL);
 
     /* also register as child of eve-log */
     OutputRegisterTxSubModule("eve-log", "JsonHttpLog", "eve-log.http",
-        OutputHttpLogInitSub, ALPROTO_HTTP, JsonHttpLogger, NULL, NULL, NULL);
+        OutputHttpLogInitSub, ALPROTO_HTTP, JsonHttpLogger,
+        JsonHttpLogThreadInit, JsonHttpLogThreadDeinit, 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 TmModuleJsonHttpLogRegister (void)
 {
-    tmm_modules[TMM_JSONHTTPLOG].name = "JsonHttpLog";
-    tmm_modules[TMM_JSONHTTPLOG].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 eb2ef2567cf4bf38240a72016039edd06680d744..9e3a83604b872cd2855bc70cdefdac1cda2806c3 100644 (file)
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -245,7 +245,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_STREAMINGLOGGER);
         CASE_CODE (TMM_JSONALERTLOG);
         CASE_CODE (TMM_JSONDROPLOG);
-        CASE_CODE (TMM_JSONHTTPLOG);
         CASE_CODE (TMM_JSONFILELOG);
         CASE_CODE (TMM_JSONFLOWLOG);
         CASE_CODE (TMM_JSONNETFLOWLOG);

diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 8ccfeeac5f9a31d56a8e9af1f6afb69a70401a81..c844f2c17e738e8ac72957b83e39368810e0b921 100644 (file)
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -78,7 +78,6 @@ typedef enum {
     TMM_STREAMINGLOGGER,
     TMM_JSONALERTLOG,
     TMM_JSONDROPLOG,
-    TMM_JSONHTTPLOG,
     TMM_JSONSMTPLOG,
     TMM_JSONSSHLOG,
     TMM_JSONSTATSLOG,