From: Jason Ish <ish@unx.ca>
Date: Fri, 27 May 2016 16:05:44 +0000 (-0600)
Subject: logging: convert json template output to non-thread module
X-Git-Tag: suricata-3.2beta1~375
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5bbb4fd1341e9b204786b262743c94bb85f14a59;p=thirdparty%2Fsuricata.git

logging: convert json template output to non-thread module
---

diff --git a/src/output-json-template.c b/src/output-json-template.c
index ca49f81ecd..195f1786f3 100644
--- 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 c8fbd57681..a707f69efb 100644
--- 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 3323faab44..696f1f855e 100644
--- 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,