logging: convert tls log to non-thread module

diff --git a/src/log-tlslog.c b/src/log-tlslog.c
index d0274f222a542e50b5b7e5c9cd8b1dbf2e658f85..0239606362ea0ed9f395e986794f0d106bfa837c 100644 (file)
--- a/src/log-tlslog.c
+++ b/src/log-tlslog.c
@@ -314,15 +314,7 @@ static int LogTlsLogger(ThreadVars *tv, void *thread_data, const Packet *p,
 
 void TmModuleLogTlsLogRegister(void)
 {
-    tmm_modules[TMM_LOGTLSLOG].name = MODULE_NAME;
-    tmm_modules[TMM_LOGTLSLOG].ThreadInit = LogTlsLogThreadInit;
-    tmm_modules[TMM_LOGTLSLOG].ThreadExitPrintStats = LogTlsLogExitPrintStats;
-    tmm_modules[TMM_LOGTLSLOG].ThreadDeinit = LogTlsLogThreadDeinit;
-    tmm_modules[TMM_LOGTLSLOG].RegisterTests = NULL;
-    tmm_modules[TMM_LOGTLSLOG].cap_flags = 0;
-    tmm_modules[TMM_LOGTLSLOG].flags = TM_FLAG_LOGAPI_TM;
-
     OutputRegisterTxModuleWithProgress(MODULE_NAME, "tls-log", LogTlsLogInitCtx,
         ALPROTO_TLS, LogTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE,
-        NULL, NULL, NULL);
+        LogTlsLogThreadInit, LogTlsLogThreadDeinit, LogTlsLogExitPrintStats);
 }

diff --git a/src/tm-modules.c b/src/tm-modules.c
index d12089d0aae5973ec91d5a4be364238b3604e4cc..d2c22aefefa034ecd569b7ed654a587c0cf06239 100644 (file)
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -212,7 +212,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_RECEIVEPFRING);
         CASE_CODE (TMM_DECODEPFRING);
         CASE_CODE (TMM_RESPONDREJECT);
-        CASE_CODE (TMM_LOGTLSLOG);
         CASE_CODE (TMM_PCAPLOG);
         CASE_CODE (TMM_DECODEIPFW);
         CASE_CODE (TMM_VERDICTIPFW);

diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 0938b2f611d518ba30c649fc989e9ec942bcd957..eb455888d2029eb6c2fbb73a55d560c680cc8b52 100644 (file)
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -42,7 +42,6 @@ typedef enum {
     TMM_RECEIVEPFRING,
     TMM_DECODEPFRING,
     TMM_RESPONDREJECT,
-    TMM_LOGTLSLOG,
     TMM_OUTPUTJSON,
     TMM_PCAPLOG,
     TMM_DECODEIPFW,