From: Jason Ish <ish@unx.ca>
Date: Fri, 27 May 2016 16:17:21 +0000 (-0600)
Subject: logging: convert alert syslog to non-thread module
X-Git-Tag: suricata-3.2beta1~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e00dcd52a0b3da1e39ba4d8d5d6043c0a97e03cc;p=thirdparty%2Fsuricata.git

logging: convert alert syslog to non-thread module
---

diff --git a/src/alert-syslog.c b/src/alert-syslog.c
index 2dd541b66b..a48b99f7a2 100644
--- a/src/alert-syslog.c
+++ b/src/alert-syslog.c
@@ -411,17 +411,9 @@ static int AlertSyslogLogger(ThreadVars *tv, void *thread_data, const Packet *p)
 void TmModuleAlertSyslogRegister (void)
 {
 #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",
-        AlertSyslogInitCtx, AlertSyslogLogger, AlertSyslogCondition, NULL, NULL, NULL);
-
+        AlertSyslogInitCtx, AlertSyslogLogger, AlertSyslogCondition,
+        AlertSyslogThreadInit, AlertSyslogThreadDeinit,
+        AlertSyslogExitPrintStats);
 #endif /* !OS_WIN32 */
 }
diff --git a/src/tm-modules.c b/src/tm-modules.c
index a707f69efb..7b79668eee 100644
--- a/src/tm-modules.c
+++ b/src/tm-modules.c
@@ -213,8 +213,6 @@ const char * TmModuleTmmIdToString(TmmId id)
         CASE_CODE (TMM_DECODEPFRING);
         CASE_CODE (TMM_ALERTUNIFIED2ALERT);
         CASE_CODE (TMM_ALERTDEBUGLOG);
-        CASE_CODE (TMM_ALERTSYSLOG);
-        CASE_CODE (TMM_LOGDROPLOG);
         CASE_CODE (TMM_RESPONDREJECT);
         CASE_CODE (TMM_LOGHTTPLOG);
         CASE_CODE (TMM_LOGTLSLOG);
diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h
index 696f1f855e..1b2824a2a3 100644
--- a/src/tm-threads-common.h
+++ b/src/tm-threads-common.h
@@ -43,8 +43,6 @@ typedef enum {
     TMM_DECODEPFRING,
     TMM_ALERTUNIFIED2ALERT,
     TMM_ALERTDEBUGLOG,
-    TMM_ALERTSYSLOG,
-    TMM_LOGDROPLOG,
     TMM_RESPONDREJECT,
     TMM_LOGHTTPLOG,
     TMM_LOGTLSLOG,