logging: convert json template output to non-thread module

diff --git a/src/output-json-template.c b/src/output-json-template.c
index ca49f81ecdd68667c097ac2f8dc38ae446af33c3..195f1786f349ae1d97ee4c9c8f62075698604351 100644 (file)
--- a/src/output-json-template.c
+++ b/src/output-json-template.c
@@ -197,35 +197,20 @@ void TmModuleJsonTemplateLogRegister(void)
         return;
     }
     /* TEMPLATE_END_REMOVE */
-    tmm_modules[TMM_JSONTEMPLATELOG].name = "JsonTemplateLog";
-    tmm_modules[TMM_JSONTEMPLATELOG].ThreadInit = JsonTemplateLogThreadInit;
-    tmm_modules[TMM_JSONTEMPLATELOG].ThreadDeinit = JsonTemplateLogThreadDeinit;
-    tmm_modules[TMM_JSONTEMPLATELOG].RegisterTests = NULL;
-    tmm_modules[TMM_JSONTEMPLATELOG].cap_flags = 0;
-    tmm_modules[TMM_JSONTEMPLATELOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* Register as an eve sub-module. */
     OutputRegisterTxSubModule("eve-log", "JsonTemplateLog", "eve-log.template",
-        OutputTemplateLogInitSub, ALPROTO_TEMPLATE, JsonTemplateLogger, NULL,
-        NULL, NULL);
+        OutputTemplateLogInitSub, ALPROTO_TEMPLATE, JsonTemplateLogger,
+        JsonTemplateLogThreadInit, JsonTemplateLogThreadDeinit, NULL);
 
     SCLogNotice("Template JSON logger registered.");
 }
 
 #else /* No JSON support. */
 
-static TmEcode JsonTemplateLogThreadInit(ThreadVars *t, void *initdata,
-    void **data)
-{
-    SCLogInfo("Cannot initialize JSON output for template. "
-        "JSON support was disabled during build.");
-    return TM_ECODE_FAILED;
-}
-
 void TmModuleJsonTemplateLogRegister(void)
 {
-    tmm_modules[TMM_JSONTEMPLATELOG].name = "JsonTemplateLog";
-    tmm_modules[TMM_JSONTEMPLATELOG].ThreadInit = JsonTemplateLogThreadInit;
+    SCLogInfo("Cannot register JSON output for template. "
+        "JSON support was disabled during build.");
 }
 
 #endif /* HAVE_LIBJANSSON */

diff --git a/src/tm-modules.c b/src/tm-modules.c
index c8fbd57681e8c1aadec5b5a6490d9e5e9e171136..a707f69efbd2c7e0be94753b7388024a6d20c4c5 100644 (file)
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -251,7 +251,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_DETECTLOADER);
         CASE_CODE (TMM_LUALOG);
         CASE_CODE (TMM_LOGSTATSLOG);
-        CASE_CODE (TMM_JSONTEMPLATELOG);
         CASE_CODE (TMM_RECEIVENETMAP);
         CASE_CODE (TMM_DECODENETMAP);
         CASE_CODE (TMM_TLSSTORE);

diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 3323faab44e42163e7a387435414835f28287eb1..696f1f855ed95b945317cfbc6492b3da328a541e 100644 (file)
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -80,7 +80,6 @@ typedef enum {
     TMM_RECEIVENFLOG,
     TMM_DECODENFLOG,
     TMM_LOGSTATSLOG,
-    TMM_JSONTEMPLATELOG,
 
     TMM_FLOWMANAGER,
     TMM_FLOWRECYCLER,