logging: convert alert syslog to non-thread module

pull/2245/head
Jason Ish 9 years ago committed by Victor Julien
parent 869d2eb701
commit e00dcd52a0

@ -411,17 +411,9 @@ static int AlertSyslogLogger(ThreadVars *tv, void *thread_data, const Packet *p)
void TmModuleAlertSyslogRegister (void) void TmModuleAlertSyslogRegister (void)
{ {
#ifndef OS_WIN32 #ifndef OS_WIN32
tmm_modules[TMM_ALERTSYSLOG].name = MODULE_NAME;
tmm_modules[TMM_ALERTSYSLOG].ThreadInit = AlertSyslogThreadInit;
tmm_modules[TMM_ALERTSYSLOG].Func = NULL;
tmm_modules[TMM_ALERTSYSLOG].ThreadExitPrintStats = AlertSyslogExitPrintStats;
tmm_modules[TMM_ALERTSYSLOG].ThreadDeinit = AlertSyslogThreadDeinit;
tmm_modules[TMM_ALERTSYSLOG].RegisterTests = NULL;
tmm_modules[TMM_ALERTSYSLOG].cap_flags = 0;
tmm_modules[TMM_ALERTSYSLOG].flags = TM_FLAG_LOGAPI_TM;
OutputRegisterPacketModule(MODULE_NAME, "syslog", OutputRegisterPacketModule(MODULE_NAME, "syslog",
AlertSyslogInitCtx, AlertSyslogLogger, AlertSyslogCondition, NULL, NULL, NULL); AlertSyslogInitCtx, AlertSyslogLogger, AlertSyslogCondition,
AlertSyslogThreadInit, AlertSyslogThreadDeinit,
AlertSyslogExitPrintStats);
#endif /* !OS_WIN32 */ #endif /* !OS_WIN32 */
} }

@ -213,8 +213,6 @@ const char * TmModuleTmmIdToString(TmmId id)
CASE_CODE (TMM_DECODEPFRING); CASE_CODE (TMM_DECODEPFRING);
CASE_CODE (TMM_ALERTUNIFIED2ALERT); CASE_CODE (TMM_ALERTUNIFIED2ALERT);
CASE_CODE (TMM_ALERTDEBUGLOG); CASE_CODE (TMM_ALERTDEBUGLOG);
CASE_CODE (TMM_ALERTSYSLOG);
CASE_CODE (TMM_LOGDROPLOG);
CASE_CODE (TMM_RESPONDREJECT); CASE_CODE (TMM_RESPONDREJECT);
CASE_CODE (TMM_LOGHTTPLOG); CASE_CODE (TMM_LOGHTTPLOG);
CASE_CODE (TMM_LOGTLSLOG); CASE_CODE (TMM_LOGTLSLOG);

@ -43,8 +43,6 @@ typedef enum {
TMM_DECODEPFRING, TMM_DECODEPFRING,
TMM_ALERTUNIFIED2ALERT, TMM_ALERTUNIFIED2ALERT,
TMM_ALERTDEBUGLOG, TMM_ALERTDEBUGLOG,
TMM_ALERTSYSLOG,
TMM_LOGDROPLOG,
TMM_RESPONDREJECT, TMM_RESPONDREJECT,
TMM_LOGHTTPLOG, TMM_LOGHTTPLOG,
TMM_LOGTLSLOG, TMM_LOGTLSLOG,

Loading…
Cancel
Save