logging: convert http log to non-thread module

pull/2245/head
Jason Ish 10 years ago committed by Victor Julien
parent e00dcd52a0
commit 9475c83713

@ -65,16 +65,9 @@ int LogHttpLogger(ThreadVars *tv, void *thread_data, const Packet *, Flow *f, vo
void TmModuleLogHttpLogRegister (void) void TmModuleLogHttpLogRegister (void)
{ {
tmm_modules[TMM_LOGHTTPLOG].name = MODULE_NAME;
tmm_modules[TMM_LOGHTTPLOG].ThreadInit = LogHttpLogThreadInit;
tmm_modules[TMM_LOGHTTPLOG].ThreadExitPrintStats = LogHttpLogExitPrintStats;
tmm_modules[TMM_LOGHTTPLOG].ThreadDeinit = LogHttpLogThreadDeinit;
tmm_modules[TMM_LOGHTTPLOG].RegisterTests = NULL;
tmm_modules[TMM_LOGHTTPLOG].cap_flags = 0;
tmm_modules[TMM_LOGHTTPLOG].flags = TM_FLAG_LOGAPI_TM;
OutputRegisterTxModule(MODULE_NAME, "http-log", LogHttpLogInitCtx, OutputRegisterTxModule(MODULE_NAME, "http-log", LogHttpLogInitCtx,
ALPROTO_HTTP, LogHttpLogger, NULL, NULL, NULL); ALPROTO_HTTP, LogHttpLogger, LogHttpLogThreadInit,
LogHttpLogThreadDeinit, LogHttpLogExitPrintStats);
} }
#define LOG_HTTP_MAXN_NODES 64 #define LOG_HTTP_MAXN_NODES 64

@ -214,7 +214,6 @@ const char * TmModuleTmmIdToString(TmmId id)
CASE_CODE (TMM_ALERTUNIFIED2ALERT); CASE_CODE (TMM_ALERTUNIFIED2ALERT);
CASE_CODE (TMM_ALERTDEBUGLOG); CASE_CODE (TMM_ALERTDEBUGLOG);
CASE_CODE (TMM_RESPONDREJECT); CASE_CODE (TMM_RESPONDREJECT);
CASE_CODE (TMM_LOGHTTPLOG);
CASE_CODE (TMM_LOGTLSLOG); CASE_CODE (TMM_LOGTLSLOG);
CASE_CODE (TMM_LOGTCPDATALOG); CASE_CODE (TMM_LOGTCPDATALOG);
CASE_CODE (TMM_PCAPLOG); CASE_CODE (TMM_PCAPLOG);

@ -44,7 +44,6 @@ typedef enum {
TMM_ALERTUNIFIED2ALERT, TMM_ALERTUNIFIED2ALERT,
TMM_ALERTDEBUGLOG, TMM_ALERTDEBUGLOG,
TMM_RESPONDREJECT, TMM_RESPONDREJECT,
TMM_LOGHTTPLOG,
TMM_LOGTLSLOG, TMM_LOGTLSLOG,
TMM_LOGTCPDATALOG, TMM_LOGTCPDATALOG,
TMM_OUTPUTJSON, TMM_OUTPUTJSON,

Loading…
Cancel
Save