logging: convert alert syslog to non-thread module

diff --git a/src/alert-syslog.c b/src/alert-syslog.c
index 2dd541b66bb4d3f352e9f9e1320c6e4eeab4dc6f..a48b99f7a23b7ca3eb3d43044175d5f2f41ed61d 100644 (file)
--- 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 a707f69efbd2c7e0be94753b7388024a6d20c4c5..7b79668eeee1845f6455f64beb2a10f649766c25 100644 (file)
--- 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 696f1f855ed95b945317cfbc6492b3da328a541e..1b2824a2a3bc2d0d8a8d57d3d1188d91670350e8 100644 (file)
--- 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,