logging: convert json ssh output to non-thread module

diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c
index d99c6e88807bfee53fb92b532d6d2382c59cc220..313df7c824aa409b6f6c09c4fe4ebffce8f1a06d 100644 (file)
--- a/src/output-json-ssh.c
+++ b/src/output-json-ssh.c
@@ -316,34 +316,22 @@ dontlog:
 
 void TmModuleJsonSshLogRegister (void)
 {
-    tmm_modules[TMM_JSONSSHLOG].name = "JsonSshLog";
-    tmm_modules[TMM_JSONSSHLOG].ThreadInit = JsonSshLogThreadInit;
-    tmm_modules[TMM_JSONSSHLOG].ThreadDeinit = JsonSshLogThreadDeinit;
-    tmm_modules[TMM_JSONSSHLOG].RegisterTests = NULL;
-    tmm_modules[TMM_JSONSSHLOG].cap_flags = 0;
-    tmm_modules[TMM_JSONSSHLOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* register as separate module */
     OutputRegisterPacketModule("JsonSshLog", "ssh-json-log", OutputSshLogInit,
-        JsonSshLogger, JsonSshCondition, NULL, NULL, NULL);
+        JsonSshLogger, JsonSshCondition, JsonSshLogThreadInit,
+        JsonSshLogThreadDeinit, NULL);
 
     /* also register as child of eve-log */
     OutputRegisterPacketSubModule("eve-log", "JsonSshLog", "eve-log.ssh",
-        OutputSshLogInitSub, JsonSshLogger, JsonSshCondition, NULL, NULL, NULL);
+        OutputSshLogInitSub, JsonSshLogger, JsonSshCondition,
+        JsonSshLogThreadInit, JsonSshLogThreadDeinit, NULL);
 }
 
 #else
 
-static TmEcode OutputJsonThreadInit(ThreadVars *t, void *initdata, void **data)
-{
-    SCLogInfo("Can't init JSON output - JSON support was disabled during build.");
-    return TM_ECODE_FAILED;
-}
-
 void TmModuleJsonSshLogRegister (void)
 {
-    tmm_modules[TMM_JSONSSHLOG].name = "JsonSshLog";
-    tmm_modules[TMM_JSONSSHLOG].ThreadInit = OutputJsonThreadInit;
+    SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }
 
 #endif

diff --git a/src/tm-modules.c b/src/tm-modules.c
index 1d1040fcda206901efe3ee5e4e3c720f37cea016..dc4605e45f56fb6fba1299737cc53fee3582477f 100644 (file)
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -245,7 +245,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_JSONDROPLOG);
         CASE_CODE (TMM_JSONFILELOG);
         CASE_CODE (TMM_JSONSMTPLOG);
-        CASE_CODE (TMM_JSONSSHLOG);
         CASE_CODE (TMM_JSONSTATSLOG);
         CASE_CODE (TMM_OUTPUTJSON);
         CASE_CODE (TMM_FLOWMANAGER);

diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 7739146e669d664c98131d27a1872b29d1072c49..17c531e085ee79024a1a66ce7ce18eba9f481201 100644 (file)
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -77,7 +77,6 @@ typedef enum {
     TMM_STREAMINGLOGGER,
     TMM_JSONDROPLOG,
     TMM_JSONSMTPLOG,
-    TMM_JSONSSHLOG,
     TMM_JSONSTATSLOG,
     TMM_JSONFILELOG,
     TMM_RECEIVENFLOG,