From: Jason Ish <ish@unx.ca>
Date: Fri, 27 May 2016 16:21:19 +0000 (-0600)
Subject: logging: convert http log to non-thread module
X-Git-Tag: suricata-3.2beta1~372
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9475c8371380f37ee83aecf8e30f47e6dbe128aa;p=thirdparty%2Fsuricata.git

logging: convert http log to non-thread module
---

diff --git a/src/log-httplog.c b/src/log-httplog.c
index 04db70a43d..64b825f891 100644
--- a/src/log-httplog.c
+++ b/src/log-httplog.c
@@ -65,16 +65,9 @@ int LogHttpLogger(ThreadVars *tv, void *thread_data, const Packet *, Flow *f, vo
 
 void TmModuleLogHttpLogRegister (void)
 {
-    tmm_modules[TMM_LOGHTTPLOG].name = MODULE_NAME;
-    tmm_modules[TMM_LOGHTTPLOG].ThreadInit = LogHttpLogThreadInit;
-    tmm_modules[TMM_LOGHTTPLOG].ThreadExitPrintStats = LogHttpLogExitPrintStats;
-    tmm_modules[TMM_LOGHTTPLOG].ThreadDeinit = LogHttpLogThreadDeinit;
-    tmm_modules[TMM_LOGHTTPLOG].RegisterTests = NULL;
-    tmm_modules[TMM_LOGHTTPLOG].cap_flags = 0;
-    tmm_modules[TMM_LOGHTTPLOG].flags = TM_FLAG_LOGAPI_TM;
-
     OutputRegisterTxModule(MODULE_NAME, "http-log", LogHttpLogInitCtx,
-        ALPROTO_HTTP, LogHttpLogger, NULL, NULL, NULL);
+        ALPROTO_HTTP, LogHttpLogger, LogHttpLogThreadInit,
+        LogHttpLogThreadDeinit, LogHttpLogExitPrintStats);
 }
 
 #define LOG_HTTP_MAXN_NODES 64
diff --git a/src/tm-modules.c b/src/tm-modules.c
index 7b79668eee..df0b21ecc8 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -214,7 +214,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_ALERTUNIFIED2ALERT);
         CASE_CODE (TMM_ALERTDEBUGLOG);
         CASE_CODE (TMM_RESPONDREJECT);
-        CASE_CODE (TMM_LOGHTTPLOG);
         CASE_CODE (TMM_LOGTLSLOG);
         CASE_CODE (TMM_LOGTCPDATALOG);
         CASE_CODE (TMM_PCAPLOG);
diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 1b2824a2a3..861bd8e6f7 100644
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -44,7 +44,6 @@ typedef enum {
     TMM_ALERTUNIFIED2ALERT,
     TMM_ALERTDEBUGLOG,
     TMM_RESPONDREJECT,
-    TMM_LOGHTTPLOG,
     TMM_LOGTLSLOG,
     TMM_LOGTCPDATALOG,
     TMM_OUTPUTJSON,