logging: convert lua output to non-thread module

pull/2245/head
Jason Ish 10 years ago committed by Victor Julien
parent 7a0737b9a9
commit 42b8f30272

@ -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);
}

@ -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);

@ -75,7 +75,6 @@ typedef enum {
TMM_UNIXMANAGER,
TMM_LUALOG,
TMM_SIZE,
} TmmId;

Loading…
Cancel
Save