logging: convert tls store logging to non-thread module

diff --git a/src/log-tlsstore.c b/src/log-tlsstore.c
index 317f80ffc4b7cac6b134dcaf7a5c97e4930ead8a..d26d02e505312c0b761a1dffb58cf107f5f5b867 100644 (file)
--- a/src/log-tlsstore.c
+++ b/src/log-tlsstore.c
@@ -408,19 +408,10 @@ static OutputCtx *LogTlsStoreLogInitCtx(ConfNode *conf)
 
 void TmModuleLogTlsStoreRegister (void)
 {
-    tmm_modules[TMM_TLSSTORE].name = MODULE_NAME;
-    tmm_modules[TMM_TLSSTORE].ThreadInit = LogTlsStoreLogThreadInit;
-    tmm_modules[TMM_TLSSTORE].Func = NULL;
-    tmm_modules[TMM_TLSSTORE].ThreadExitPrintStats = LogTlsStoreLogExitPrintStats;
-    tmm_modules[TMM_TLSSTORE].ThreadDeinit = LogTlsStoreLogThreadDeinit;
-    tmm_modules[TMM_TLSSTORE].RegisterTests = NULL;
-    tmm_modules[TMM_TLSSTORE].cap_flags = 0;
-    tmm_modules[TMM_TLSSTORE].flags = TM_FLAG_LOGAPI_TM;
-    tmm_modules[TMM_TLSSTORE].priority = 10;
-
     OutputRegisterTxModuleWithCondition(MODULE_NAME, "tls-store",
-            LogTlsStoreLogInitCtx, ALPROTO_TLS, LogTlsStoreLogger,
-            LogTlsStoreCondition);
+        LogTlsStoreLogInitCtx, ALPROTO_TLS, LogTlsStoreLogger,
+        LogTlsStoreCondition, LogTlsStoreLogThreadInit,
+        LogTlsStoreLogThreadDeinit, LogTlsStoreLogExitPrintStats);
 
     SC_ATOMIC_INIT(cert_id);
 

diff --git a/src/output.c b/src/output.c
index 1650995d867a93ded46918a4cc547283a87acd20..85840cb18e1bb26f84bf01eab5bfe6d8a71bab27 100644 (file)
--- a/src/output.c
+++ b/src/output.c
@@ -250,23 +250,25 @@ error:
  *
  * \retval Returns 0 on success, -1 on failure.
  */
-void OutputRegisterTxModuleWithCondition(const char *name, const char *conf_name,
-        OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,
-        TxLogger TxLogFunc, TxLoggerCondition TxLogCondition)
+void OutputRegisterTxModuleWithCondition(const char *name,
+    const char *conf_name, OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,
+    TxLogger TxLogFunc, TxLoggerCondition TxLogCondition,
+    ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
+    ThreadExitPrintStatsFunc ThreadExitPrintStats)
 {
     OutputRegisterTxModuleWrapper(name, conf_name, InitFunc, alproto,
-                                  TxLogFunc, -1, -1, TxLogCondition, NULL, NULL,
-                                  NULL);
+        TxLogFunc, -1, -1, TxLogCondition, NULL, NULL, NULL);
 }
 
 void OutputRegisterTxSubModuleWithCondition(const char *parent_name,
-        const char *name, const char *conf_name, OutputCtx *(*InitFunc)(ConfNode *,
-        OutputCtx *parent_ctx), AppProto alproto, TxLogger TxLogFunc,
-        TxLoggerCondition TxLogCondition)
+    const char *name, const char *conf_name,
+    OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *parent_ctx), AppProto alproto,
+    TxLogger TxLogFunc, TxLoggerCondition TxLogCondition,
+    ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
+    ThreadExitPrintStatsFunc ThreadExitPrintStats)
 {
     OutputRegisterTxSubModuleWrapper(parent_name, name, conf_name, InitFunc,
-                                     alproto, TxLogFunc, -1, -1,
-                                     TxLogCondition, NULL, NULL, NULL);
+        alproto, TxLogFunc, -1, -1, TxLogCondition, NULL, NULL, NULL);
 }
 
 /**

diff --git a/src/output.h b/src/output.h
index 007031bc9100fc552c1d829660500e6f07cd277e..073f810cad220c85ce80351dd9d697c5663cbe3a 100644 (file)
--- a/src/output.h
+++ b/src/output.h
@@ -94,13 +94,17 @@ void OutputRegisterTxSubModule(const char *parent_name, const char *name,
     ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void OutputRegisterTxModuleWithCondition(const char *name, const char *conf_name,
-        OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,
-        TxLogger TxLogFunc, TxLoggerCondition TxLogCondition);
+void OutputRegisterTxModuleWithCondition(const char *name,
+    const char *conf_name, OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,
+    TxLogger TxLogFunc, TxLoggerCondition TxLogCondition,
+    ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
+    ThreadExitPrintStatsFunc ThreadExitPrintStats);
 void OutputRegisterTxSubModuleWithCondition(const char *parent_name,
-        const char *name, const char *conf_name, OutputCtx *(*InitFunc)(ConfNode *,
-        OutputCtx *parent_ctx), AppProto alproto, TxLogger TxLogFunc,
-        TxLoggerCondition TxLogCondition);
+    const char *name, const char *conf_name,
+    OutputCtx *(*InitFunc)(ConfNode *, OutputCtx *parent_ctx), AppProto alproto,
+    TxLogger TxLogFunc, TxLoggerCondition TxLogCondition,
+    ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
+    ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
 void OutputRegisterTxModuleWithProgress(const char *name, const char *conf_name,
     OutputCtx *(*InitFunc)(ConfNode *), AppProto alproto,

diff --git a/src/tm-modules.c b/src/tm-modules.c
index 341488b411d9b581a1022024d11ccddd9dd121de..49d519e66f709519135622491b632dc6652aebb5 100644 (file)
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -244,7 +244,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_LUALOG);
         CASE_CODE (TMM_RECEIVENETMAP);
         CASE_CODE (TMM_DECODENETMAP);
-        CASE_CODE (TMM_TLSSTORE);
 
         CASE_CODE (TMM_SIZE);
     }

diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 58506737486f380a0e24ff9225af682832a1642d..dfebc45429a852f6728c025557f9f90fec49ee5c 100644 (file)
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -79,7 +79,6 @@ typedef enum {
     TMM_UNIXMANAGER,
 
     TMM_LUALOG,
-    TMM_TLSSTORE,
     TMM_SIZE,
 } TmmId;