From: Jason Ish <ish@unx.ca>
Date: Tue, 31 May 2016 16:23:34 +0000 (-0600)
Subject: logging: convert lua output to non-thread module
X-Git-Tag: suricata-3.2beta1~363
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42b8f302727ee416e010273669f5da573017074a;p=thirdparty%2Fsuricata.git

logging: convert lua output to non-thread module
---

diff --git a/src/output-lua.c b/src/output-lua.c
index d053487da9..7d3ae065e5 100644
--- a/src/output-lua.c
+++ b/src/output-lua.c
@@ -84,6 +84,9 @@ typedef struct LogLuaThreadCtx_ {
     LogLuaCtx *lua_ctx;
 } LogLuaThreadCtx;
 
+static TmEcode LuaLogThreadInit(ThreadVars *t, void *initdata, void **data);
+static TmEcode LuaLogThreadDeinit(ThreadVars *t, void *data);
+
 /** \internal
  *  \brief TX logger for lua scripts
  *
@@ -858,6 +861,8 @@ static OutputCtx *OutputLuaLogInit(ConfNode *conf)
         om->name = MODULE_NAME;
         om->conf_name = script->val;
         om->InitSubFunc = OutputLuaLogInitSub;
+        om->ThreadInit = LuaLogThreadInit;
+        om->ThreadDeinit = LuaLogThreadDeinit;
 
         if (opts.alproto == ALPROTO_HTTP && opts.streaming) {
             om->StreamingLogFunc = LuaStreamingLogger;
@@ -996,13 +1001,6 @@ static TmEcode LuaLogThreadDeinit(ThreadVars *t, void *data)
 }
 
 void TmModuleLuaLogRegister (void) {
-    tmm_modules[TMM_LUALOG].name = MODULE_NAME;
-    tmm_modules[TMM_LUALOG].ThreadInit = LuaLogThreadInit;
-    tmm_modules[TMM_LUALOG].ThreadDeinit = LuaLogThreadDeinit;
-    tmm_modules[TMM_LUALOG].RegisterTests = NULL;
-    tmm_modules[TMM_LUALOG].cap_flags = 0;
-    tmm_modules[TMM_LUALOG].flags = TM_FLAG_LOGAPI_TM;
-
     /* register as separate module */
     OutputRegisterModule(MODULE_NAME, "lua", OutputLuaLogInit);
 }
diff --git a/src/tm-modules.c b/src/tm-modules.c
index d2c22aefef..d47637f296 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -238,7 +238,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_FLOWRECYCLER);
         CASE_CODE (TMM_UNIXMANAGER);
         CASE_CODE (TMM_DETECTLOADER);
-        CASE_CODE (TMM_LUALOG);
         CASE_CODE (TMM_RECEIVENETMAP);
         CASE_CODE (TMM_DECODENETMAP);
 
diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index eb455888d2..c9a449bcde 100644
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -75,7 +75,6 @@ typedef enum {
 
     TMM_UNIXMANAGER,
 
-    TMM_LUALOG,
     TMM_SIZE,
 } TmmId;