logging: rename registration functions to not have tmm

As the logging modules are no longer threading modules, rename
them so they don't look like they are being registered as
threading modules.

Also, move the registration to the output.c which will handle
registration of the loggers.

src/alert-debuglog.c

@@ -510,7 +510,7 @@ static int AlertDebugLogLogger(ThreadVars *tv, void *thread_data, const Packet *
     return TM_ECODE_OK;
 }
 
-void TmModuleAlertDebugLogRegister (void)
+void AlertDebugLogRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_ALERT_DEBUG, MODULE_NAME, "alert-debug",
         AlertDebugLogInitCtx, AlertDebugLogLogger, AlertDebugLogCondition,

src/alert-debuglog.h

@@ -24,7 +24,7 @@
 #ifndef __ALERT_DEBUGLOG_H__
 #define __ALERT_DEBUGLOG_H__
 
-void TmModuleAlertDebugLogRegister (void);
+void AlertDebugLogRegister(void);
 
 #endif /* __ALERT_DEBUGLOG_H__ */
 

src/alert-fastlog.c

@@ -76,7 +76,7 @@ static void AlertFastLogDeInitCtx(OutputCtx *);
 int AlertFastLogCondition(ThreadVars *tv, const Packet *p);
 int AlertFastLogger(ThreadVars *tv, void *data, const Packet *p);
 
-void TmModuleAlertFastLogRegister (void)
+void AlertFastLogRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_ALERT_FAST, MODULE_NAME, "fast",
         AlertFastLogInitCtx, AlertFastLogger, AlertFastLogCondition,

src/alert-fastlog.h

@@ -24,7 +24,7 @@
 #ifndef __ALERT_FASTLOG_H__
 #define __ALERT_FASTLOG_H__
 
-void TmModuleAlertFastLogRegister(void);
+void AlertFastLogRegister(void);
 void TmModuleAlertFastLogIPv4Register(void);
 void TmModuleAlertFastLogIPv6Register(void);
 OutputCtx *AlertFastLogInitCtx(ConfNode *);

src/alert-prelude.c

@@ -62,7 +62,7 @@
 
 /* Handle the case where no PRELUDE support is compiled in. */
 
-void TmModuleAlertPreludeRegister (void)
+void AlertPreludeRegister(void)
 {
     SCLogDebug("Can't register Prelude output thread - Prelude support was disabled during build.");
 }
@@ -914,7 +914,7 @@ err:
     SCReturnInt(TM_ECODE_FAILED);
 }
 
-void TmModuleAlertPreludeRegister (void)
+void AlertPreludeRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_PRELUDE, "AlertPrelude", "alert-prelude",
         AlertPreludeInitCtx, AlertPreludeLogger, AlertPreludeCondition,

src/alert-prelude.h

@@ -26,6 +26,6 @@
 #ifndef __ALERT_PRELUDE_H__
 #define __ALERT_PRELUDE_H__
 
-void TmModuleAlertPreludeRegister (void);
+void AlertPreludeRegister(void);
 
 #endif /* __ALERT_PRELUDE_H__ */

src/alert-syslog.c

@@ -408,7 +408,7 @@ static int AlertSyslogLogger(ThreadVars *tv, void *thread_data, const Packet *p)
 #endif /* !OS_WIN32 */
 
 /** \brief   Function to register the AlertSyslog module */
-void TmModuleAlertSyslogRegister (void)
+void AlertSyslogRegister (void)
 {
 #ifndef OS_WIN32
     OutputRegisterPacketModule(LOGGER_ALERT_SYSLOG, MODULE_NAME, "syslog",

src/alert-syslog.h

@@ -27,7 +27,7 @@
 #ifndef __ALERT_SYSLOG_H__
 #define __ALERT_SYSLOG_H__
 
-void TmModuleAlertSyslogRegister(void);
+void AlertSyslogRegister(void);
 
 #endif /* __ALERT_SYSLOG_H__ */
 

src/alert-unified2-alert.c

@@ -233,7 +233,7 @@ int Unified2Logger(ThreadVars *tv, void *data, const Packet *p);
 
 #define MODULE_NAME "Unified2Alert"
 
-void TmModuleUnified2AlertRegister(void)
+void Unified2AlertRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_UNIFIED2, MODULE_NAME, "unified2-alert",
         Unified2AlertInitCtx, Unified2Logger, Unified2Condition,

src/alert-unified2-alert.h

@@ -43,7 +43,7 @@
 #define UNIFIED2_EXTRADATA_TYPE_BLOB 1
 #define UNIFIED2_EXTRADATA_TYPE_EXTRA_DATA 4
 
-void TmModuleUnified2AlertRegister(void);
+void Unified2AlertRegister(void);
 OutputCtx *Unified2AlertInitCtx(ConfNode *);
 
 #endif /* __ALERT_UNIFIED2_ALERT_H__ */

src/log-dnslog.c

@@ -344,7 +344,7 @@ static OutputCtx *LogDnsLogInitCtx(ConfNode *conf)
     return output_ctx;
 }
 
-void TmModuleLogDnsLogRegister (void)
+void LogDnsLogRegister (void)
 {
     OutputRegisterTxModule(LOGGER_DNS, MODULE_NAME, "dns-log", LogDnsLogInitCtx,
         ALPROTO_DNS, LogDnsLogger, LogDnsLogThreadInit, LogDnsLogThreadDeinit,

src/log-dnslog.h

@@ -24,6 +24,6 @@
 #ifndef __LOG_DNSLOG_H__
 #define __LOG_DNSLOG_H__
 
-void TmModuleLogDnsLogRegister (void);
+void LogDnsLogRegister(void);
 
 #endif /* __LOG_DNSLOG_H__ */

src/log-droplog.c

@@ -492,7 +492,7 @@ static void LogDropLogRegisterTests(void)
 #endif
 
 /** \brief function to register the drop log module */
-void TmModuleLogDropLogRegister (void)
+void LogDropLogRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_DROP, MODULE_NAME, "drop",
         LogDropLogInitCtx, LogDropLogger, LogDropCondition,

src/log-droplog.h

@@ -26,6 +26,6 @@
 #ifndef ALERT_DROPLOG_H
 #define	ALERT_DROPLOG_H
 
-void TmModuleLogDropLogRegister(void);
+void LogDropLogRegister(void);
 
 #endif	/* ALERT_DROPLOG_H */

src/log-file.c

@@ -453,7 +453,7 @@ int LogFileLogOpenFileCtx(LogFileCtx *file_ctx, const char *filename, const
     return 0;
 }
 
-void TmModuleLogFileLogRegister (void)
+void LogFileLogRegister (void)
 {
     OutputRegisterFileModule(LOGGER_FILE, MODULE_NAME, "file-log",
         LogFileLogInitCtx, LogFileLogger, LogFileLogThreadInit,

src/log-file.h

@@ -24,6 +24,6 @@
 #ifndef __LOG_FILELOG_H__
 #define __LOG_FILELOG_H__
 
-void TmModuleLogFileLogRegister (void);
+void LogFileLogRegister(void);
 
 #endif /* __LOG_FILELOG_H__ */

src/log-filestore.c

@@ -479,7 +479,7 @@ static OutputCtx *LogFilestoreLogInitCtx(ConfNode *conf)
     SCReturnPtr(output_ctx, "OutputCtx");
 }
 
-void TmModuleLogFilestoreRegister (void)
+void LogFilestoreRegister (void)
 {
     OutputRegisterFiledataModule(LOGGER_FILE_STORE, MODULE_NAME, "file",
         LogFilestoreLogInitCtx, LogFilestoreLogger, LogFilestoreLogThreadInit,

src/log-filestore.h

@@ -24,6 +24,6 @@
 #ifndef __LOG_FILESTORE_H__
 #define __LOG_FILESTORE_H__
 
-void TmModuleLogFilestoreRegister (void);
+void LogFilestoreRegister(void);
 
 #endif /* __LOG_FILELOG_H__ */

src/log-httplog.c

@@ -63,7 +63,7 @@ static void LogHttpLogDeInitCtx(OutputCtx *);
 
 int LogHttpLogger(ThreadVars *tv, void *thread_data, const Packet *, Flow *f, void *state, void *tx, uint64_t tx_id);
 
-void TmModuleLogHttpLogRegister (void)
+void LogHttpLogRegister (void)
 {
     OutputRegisterTxModule(LOGGER_HTTP, MODULE_NAME, "http-log",
         LogHttpLogInitCtx, ALPROTO_HTTP, LogHttpLogger, LogHttpLogThreadInit,

src/log-httplog.h

@@ -24,7 +24,7 @@
 #ifndef __LOG_HTTPLOG_H__
 #define __LOG_HTTPLOG_H__
 
-void TmModuleLogHttpLogRegister (void);
+void LogHttpLogRegister(void);
 void TmModuleLogHttpLogIPv4Register (void);
 void TmModuleLogHttpLogIPv6Register (void);
 OutputCtx *LogHttpLogInitCtx(ConfNode *);

src/log-pcap.c

@@ -151,12 +151,12 @@ static OutputCtx *PcapLogInitCtx(ConfNode *);
 static void PcapLogProfilingDump(PcapLogData *);
 static int PcapLogCondition(ThreadVars *, const Packet *);
 
-void TmModulePcapLogRegister(void)
+void PcapLogRegister(void)
 {
     OutputRegisterPacketModule(LOGGER_PCAP, MODULE_NAME, "pcap-log",
         PcapLogInitCtx, PcapLog, PcapLogCondition, PcapLogDataInit,
         PcapLogDataDeinit, NULL);
-
+    PcapLogProfileSetup();
     SC_ATOMIC_INIT(thread_cnt);
     return;
 }

src/log-pcap.h

@@ -28,7 +28,7 @@
 #ifndef __LOG_PCAP_H__
 #define __LOG_PCAP_H__
 
-void TmModulePcapLogRegister (void);
+void PcapLogRegister(void);
 void PcapLogProfileSetup(void);
 
 #endif /* __LOG_PCAP_H__ */

src/log-stats.c

@@ -294,7 +294,7 @@ static void LogStatsLogDeInitCtx(OutputCtx *output_ctx)
     SCFree(output_ctx);
 }
 
-void TmModuleLogStatsLogRegister (void)
+void LogStatsLogRegister (void)
 {
     OutputRegisterStatsModule(LOGGER_STATS, MODULE_NAME, "stats",
         LogStatsLogInitCtx, LogStatsLogger, LogStatsLogThreadInit,

src/log-stats.h

@@ -24,6 +24,6 @@
 #ifndef __LOG_STATS_H__
 #define __LOG_STATS_H__
 
-void TmModuleLogStatsLogRegister (void);
+void LogStatsLogRegister(void);
 
 #endif /* __LOG_HTTPLOG_H__ */

src/log-tcp-data.c

@@ -60,7 +60,7 @@ static void LogTcpDataLogDeInitCtx(OutputCtx *);
 
 int LogTcpDataLogger(ThreadVars *tv, void *thread_data, const Flow *f, const uint8_t *data, uint32_t data_len, uint64_t tx_id, uint8_t flags);
 
-void TmModuleLogTcpDataLogRegister (void) {
+void LogTcpDataLogRegister (void) {
     OutputRegisterStreamingModule(LOGGER_TCP_DATA, MODULE_NAME, "tcp-data",
         LogTcpDataLogInitCtx, LogTcpDataLogger, STREAMING_TCP_DATA,
         LogTcpDataLogThreadInit, LogTcpDataLogThreadDeinit,

src/log-tcp-data.h

@@ -24,7 +24,7 @@
 #ifndef __LOG_TCPDATALOG_H__
 #define __LOG_TCPDATALOG_H__
 
-void TmModuleLogTcpDataLogRegister (void);
+void LogTcpDataLogRegister(void);
 OutputCtx *LogTcpDataLogInitCtx(ConfNode *);
 
 #endif /* __LOG_TCPDATALOG_H__ */

src/log-tlslog.c

@@ -312,7 +312,7 @@ static int LogTlsLogger(ThreadVars *tv, void *thread_data, const Packet *p,
     return 0;
 }
 
-void TmModuleLogTlsLogRegister(void)
+void LogTlsLogRegister(void)
 {
     OutputRegisterTxModuleWithProgress(LOGGER_TLS, MODULE_NAME, "tls-log",
         LogTlsLogInitCtx, ALPROTO_TLS, LogTlsLogger, TLS_HANDSHAKE_DONE,

src/log-tlslog.h

@@ -25,7 +25,7 @@
 #ifndef __LOG_TLSLOG_H__
 #define __LOG_TLSLOG_H__
 
-void TmModuleLogTlsLogRegister (void);
+void LogTlsLogRegister(void);
 
 int TLSGetIPInformations(const Packet *p, char* srcip, size_t srcip_len,
                              Port* sp, char* dstip, size_t dstip_len,

src/log-tlsstore.c

@@ -406,7 +406,7 @@ static OutputCtx *LogTlsStoreLogInitCtx(ConfNode *conf)
     SCReturnPtr(output_ctx, "OutputCtx");
 }
 
-void TmModuleLogTlsStoreRegister (void)
+void LogTlsStoreRegister (void)
 {
     OutputRegisterTxModuleWithCondition(LOGGER_TLS_STORE, MODULE_NAME,
         "tls-store", LogTlsStoreLogInitCtx, ALPROTO_TLS, LogTlsStoreLogger,

src/log-tlsstore.h

@@ -24,6 +24,6 @@
 #ifndef __LOG_TLSSTORE_H__
 #define __LOG_TLSSTORE_H__
 
-void TmModuleLogTlsStoreRegister (void);
+void LogTlsStoreRegister(void);
 
 #endif /* __LOG_TLSSTORE_H__ */

src/output-file.c

@@ -266,7 +266,7 @@ static void OutputFileLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleFileLoggerRegister (void)
+void OutputFileLoggerRegister(void)
 {
     OutputRegisterRootLogger(OutputFileLogThreadInit,
         OutputFileLogThreadDeinit, OutputFileLogExitPrintStats, OutputFileLog);

src/output-file.h

@@ -41,7 +41,7 @@ int OutputRegisterFileLogger(LoggerId id, const char *name, FileLogger LogFunc,
     OutputCtx *, ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void TmModuleFileLoggerRegister (void);
+void OutputFileLoggerRegister(void);
 
 void OutputFileShutdown(void);
 

src/output-filedata.c

@@ -434,7 +434,7 @@ static void OutputFiledataLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleFiledataLoggerRegister (void)
+void OutputFiledataLoggerRegister(void)
 {
     OutputRegisterRootLogger(OutputFiledataLogThreadInit,
         OutputFiledataLogThreadDeinit, OutputFiledataLogExitPrintStats,

src/output-filedata.h

@@ -46,7 +46,7 @@ int OutputRegisterFiledataLogger(LoggerId id, const char *name,
     ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void TmModuleFiledataLoggerRegister (void);
+void OutputFiledataLoggerRegister(void);
 
 void OutputFiledataShutdown(void);
 

src/output-json-alert.c

@@ -739,7 +739,7 @@ error:
     return NULL;
 }
 
-void TmModuleJsonAlertLogRegister (void)
+void JsonAlertLogRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_JSON_ALERT, MODULE_NAME, "alert-json-log",
         JsonAlertLogInitCtx, JsonAlertLogger, JsonAlertLogCondition,
@@ -752,7 +752,7 @@ void TmModuleJsonAlertLogRegister (void)
 
 #else
 
-void TmModuleJsonAlertLogRegister (void)
+void JsonAlertLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-alert.h

@@ -27,7 +27,7 @@
 #ifndef __OUTPUT_JSON_ALERT_H__
 #define __OUTPUT_JSON_ALERT_H__
 
-void TmModuleJsonAlertLogRegister (void);
+void JsonAlertLogRegister(void);
 #ifdef HAVE_LIBJANSSON
 void AlertJsonHeader(const Packet *p, const PacketAlert *pa, json_t *js);
 #endif /* HAVE_LIBJANSSON */

src/output-json-dns.c

@@ -849,7 +849,7 @@ static OutputCtx *JsonDnsLogInitCtx(ConfNode *conf)
 
 
 #define MODULE_NAME "JsonDnsLog"
-void TmModuleJsonDnsLogRegister (void)
+void JsonDnsLogRegister (void)
 {
     /* Logger for requests. */
     OutputRegisterTxModuleWithProgress(LOGGER_JSON_DNS, MODULE_NAME,
@@ -876,7 +876,7 @@ void TmModuleJsonDnsLogRegister (void)
 
 #else
 
-void TmModuleJsonDnsLogRegister (void)
+void JsonDnsLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-dns.h

@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_DNS_H__
 #define __OUTPUT_JSON_DNS_H__
 
-void TmModuleJsonDnsLogRegister (void);
+void JsonDnsLogRegister(void);
 
 #endif /* __OUTPUT_JSON_DNS_H__ */

src/output-json-drop.c

@@ -427,7 +427,7 @@ static int JsonDropLogCondition(ThreadVars *tv, const Packet *p)
     return FALSE;
 }
 
-void TmModuleJsonDropLogRegister (void)
+void JsonDropLogRegister (void)
 {
     OutputRegisterPacketModule(LOGGER_JSON_DROP, MODULE_NAME, "drop-json-log",
         JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition,
@@ -440,7 +440,7 @@ void TmModuleJsonDropLogRegister (void)
 
 #else
 
-void TmModuleJsonDropLogRegister (void)
+void JsonDropLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-drop.h

@@ -25,6 +25,6 @@
 #ifndef __OUTPUT_JSON_DROP_H__
 #define __OUTPUT_JSON_DROP_H__
 
-void TmModuleJsonDropLogRegister (void);
+void JsonDropLogRegister(void);
 
 #endif /* __OUTPUT_DROPLOG_H__ */

src/output-json-file.c

@@ -288,7 +288,7 @@ OutputCtx *OutputFileLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return output_ctx;
 }
 
-void TmModuleJsonFileLogRegister (void)
+void JsonFileLogRegister (void)
 {
     /* register as child of eve-log */
     OutputRegisterFileSubModule(LOGGER_JSON_FILE, "eve-log", "JsonFileLog",
@@ -298,7 +298,7 @@ void TmModuleJsonFileLogRegister (void)
 
 #else
 
-void TmModuleJsonFileLogRegister (void)
+void JsonFileLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-file.h

@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_FILE_H__
 #define __OUTPUT_JSON_FILE_H__
 
-void TmModuleJsonFileLogRegister (void);
+void JsonFileLogRegister(void);
 
 #endif /* __OUTPUT_JSON_FILE_H__ */

src/output-json-flow.c

@@ -448,7 +448,7 @@ static TmEcode JsonFlowLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonFlowLogRegister (void)
+void JsonFlowLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterFlowModule(LOGGER_JSON_FLOW, "JsonFlowLog", "flow-json-log",
@@ -463,7 +463,7 @@ void TmModuleJsonFlowLogRegister (void)
 
 #else
 
-void TmModuleJsonFlowLogRegister (void)
+void JsonFlowLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-flow.h

@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_FLOW_H__
 #define __OUTPUT_JSON_FLOW_H__
 
-void TmModuleJsonFlowLogRegister (void);
+void JsonFlowLogRegister(void);
 
 #endif /* __OUTPUT_JSON_FLOW_H__ */

src/output-json-http.c

@@ -582,7 +582,7 @@ static TmEcode JsonHttpLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonHttpLogRegister (void)
+void JsonHttpLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterTxModule(LOGGER_JSON_HTTP, "JsonHttpLog", "http-json-log",
@@ -597,7 +597,7 @@ void TmModuleJsonHttpLogRegister (void)
 
 #else
 
-void TmModuleJsonHttpLogRegister (void)
+void JsonHttpLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-http.h

@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_HTTP_H__
 #define __OUTPUT_JSON_HTTP_H__
 
-void TmModuleJsonHttpLogRegister (void);
+void JsonHttpLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 void JsonHttpLogJSONBasic(json_t *js, htp_tx_t *tx);

src/output-json-netflow.c

@@ -430,7 +430,7 @@ static TmEcode JsonNetFlowLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonNetFlowLogRegister (void)
+void JsonNetFlowLogRegister(void)
 {
     /* register as separate module */
     OutputRegisterFlowModule(LOGGER_JSON_NETFLOW, "JsonNetFlowLog",
@@ -445,7 +445,7 @@ void TmModuleJsonNetFlowLogRegister (void)
 
 #else
 
-void TmModuleJsonNetFlowLogRegister (void)
+void JsonNetFlowLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-netflow.h

@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_NETFLOW_H__
 #define __OUTPUT_JSON_NETFLOW_H__
 
-void TmModuleJsonNetFlowLogRegister (void);
+void JsonNetFlowLogRegister(void);
 
 #endif /* __OUTPUT_JSON_FLOW_H__ */

src/output-json-smtp.c

@@ -257,7 +257,7 @@ static TmEcode JsonSmtpLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonSmtpLogRegister (void) {
+void JsonSmtpLogRegister (void) {
     /* register as separate module */
     OutputRegisterTxModule(LOGGER_JSON_SMTP, "JsonSmtpLog", "smtp-json-log",
         OutputSmtpLogInit, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit,
@@ -271,7 +271,7 @@ void TmModuleJsonSmtpLogRegister (void) {
 
 #else
 
-void TmModuleJsonSmtpLogRegister (void)
+void JsonSmtpLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-smtp.h

@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_SMTP_H__
 #define __OUTPUT_JSON_SMTP_H__
 
-void TmModuleJsonSmtpLogRegister (void);
+void JsonSmtpLogRegister(void);
 #ifdef HAVE_LIBJANSSON
 json_t *JsonSMTPAddMetadata(const Flow *f, uint64_t tx_id);
 #endif

src/output-json-ssh.c

@@ -314,7 +314,7 @@ dontlog:
     return FALSE;
 }
 
-void TmModuleJsonSshLogRegister (void)
+void JsonSshLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterPacketModule(LOGGER_JSON_SSH, "JsonSshLog", "ssh-json-log",
@@ -329,7 +329,7 @@ void TmModuleJsonSshLogRegister (void)
 
 #else
 
-void TmModuleJsonSshLogRegister (void)
+void JsonSshLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-ssh.h

@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_SSH_H__
 #define __OUTPUT_JSON_SSH_H__
 
-void TmModuleJsonSshLogRegister (void);
+void JsonSshLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 #include "app-layer-ssh.h"

src/output-json-stats.c

@@ -371,7 +371,7 @@ OutputCtx *OutputStatsLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return output_ctx;
 }
 
-void TmModuleJsonStatsLogRegister (void) {
+void JsonStatsLogRegister(void) {
     /* register as separate module */
     OutputRegisterStatsModule(LOGGER_JSON_STATS, MODULE_NAME, "stats-json",
         OutputStatsLogInit, JsonStatsLogger, JsonStatsLogThreadInit,
@@ -385,7 +385,7 @@ void TmModuleJsonStatsLogRegister (void) {
 
 #else
 
-void TmModuleJsonStatsLogRegister (void)
+void JsonStatsLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-stats.h

@@ -33,6 +33,6 @@
 #ifdef HAVE_LIBJANSSON
 json_t *StatsToJSON(const StatsTable *st, uint8_t flags);
 #endif
-void TmModuleJsonStatsLogRegister (void);
+void JsonStatsLogRegister(void);
 
 #endif /* __OUTPUT_JSON_COUNTERS_H__ */

src/output-json-template.c

@@ -190,7 +190,7 @@ static TmEcode JsonTemplateLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleJsonTemplateLogRegister(void)
+void JsonTemplateLogRegister(void)
 {
     /* TEMPLATE_START_REMOVE */
     if (ConfGetNode("app-layer.protocols.template") == NULL) {
@@ -208,7 +208,7 @@ void TmModuleJsonTemplateLogRegister(void)
 
 #else /* No JSON support. */
 
-void TmModuleJsonTemplateLogRegister(void)
+void JsonTemplateLogRegister(void)
 {
     SCLogInfo("Cannot register JSON output for template. "
         "JSON support was disabled during build.");

src/output-json-template.h

@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_JSON_TEMPLATE_H__
 #define __OUTPUT_JSON_TEMPLATE_H__
 
-void TmModuleJsonTemplateLogRegister(void);
+void JsonTemplateLogRegister(void);
 
 #endif /* __OUTPUT_JSON_TEMPLATE_H__ */

src/output-json-tls.c

@@ -308,7 +308,7 @@ OutputCtx *OutputTlsLogInitSub(ConfNode *conf, OutputCtx *parent_ctx)
     return output_ctx;
 }
 
-void TmModuleJsonTlsLogRegister (void)
+void JsonTlsLogRegister (void)
 {
     /* register as separate module */
     OutputRegisterTxModuleWithProgress(LOGGER_JSON_TLS, "JsonTlsLog",
@@ -325,7 +325,7 @@ void TmModuleJsonTlsLogRegister (void)
 
 #else
 
-void TmModuleJsonTlsLogRegister (void)
+void JsonTlsLogRegister (void)
 {
     SCLogInfo("Can't register JSON output - JSON support was disabled during build.");
 }

src/output-json-tls.h

@@ -24,7 +24,7 @@
 #ifndef __OUTPUT_JSON_TLS_H__
 #define __OUTPUT_JSON_TLS_H__
 
-void TmModuleJsonTlsLogRegister (void);
+void JsonTlsLogRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 #include "app-layer-ssl.h"

src/output-json.c

@@ -67,7 +67,7 @@
 
 int OutputJsonOpenFileCtx(LogFileCtx *, char *);
 
-void TmModuleOutputJsonRegister (void)
+void OutputJsonRegister (void)
 {
     SCLogDebug("Can't register JSON output - JSON support was disabled during build.");
 }
@@ -84,7 +84,7 @@ void TmModuleOutputJsonRegister (void)
 
 static void OutputJsonDeInitCtx(OutputCtx *);
 
-void TmModuleOutputJsonRegister (void)
+void OutputJsonRegister (void)
 {
     OutputRegisterModule(MODULE_NAME, "eve-log", OutputJsonInitCtx);
 }

src/output-json.h

@@ -28,7 +28,7 @@
 #include "util-buffer.h"
 #include "util-logopenfile.h"
 
-void TmModuleOutputJsonRegister (void);
+void OutputJsonRegister(void);
 
 #ifdef HAVE_LIBJANSSON
 /* helper struct for OutputJSONMemBufferCallback */

src/output-lua.c

@@ -1000,14 +1000,14 @@ static TmEcode LuaLogThreadDeinit(ThreadVars *t, void *data)
     return TM_ECODE_OK;
 }
 
-void TmModuleLuaLogRegister (void) {
+void LuaLogRegister(void) {
     /* register as separate module */
     OutputRegisterModule(MODULE_NAME, "lua", OutputLuaLogInit);
 }
 
 #else
 
-void TmModuleLuaLogRegister (void) {
+void LuaLogRegister (void) {
     /* no-op */
 }
 

src/output-lua.h

@@ -24,6 +24,6 @@
 #ifndef __OUTPUT_LUA_H__
 #define __OUTPUT_LUA_H__
 
-void TmModuleLuaLogRegister (void);
+void LuaLogRegister(void);
 
 #endif /* __OUTPUT_LUA_H__ */

src/output-packet.c

@@ -209,7 +209,7 @@ static void OutputPacketLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModulePacketLoggerRegister (void)
+void OutputPacketLoggerRegister(void)
 {
     OutputRegisterRootLogger(OutputPacketLogThreadInit,
         OutputPacketLogThreadDeinit, OutputPacketLogExitPrintStats,

src/output-packet.h

@@ -41,7 +41,7 @@ int OutputRegisterPacketLogger(LoggerId logger_id, const char *name,
     PacketLogger LogFunc, PacketLogCondition ConditionFunc, OutputCtx *,
     ThreadInitFunc, ThreadDeinitFunc, ThreadExitPrintStatsFunc);
 
-void TmModulePacketLoggerRegister (void);
+void OutputPacketLoggerRegister(void);
 
 void OutputPacketShutdown(void);
 

src/output-streaming.c

@@ -441,7 +441,7 @@ static void OutputStreamingLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleStreamingLoggerRegister (void) {
+void OutputStreamingLoggerRegister(void) {
     OutputRegisterRootLogger(OutputStreamingLogThreadInit,
         OutputStreamingLogThreadDeinit, OutputStreamingLogExitPrintStats,
         OutputStreamingLog);

src/output-streaming.h

@@ -50,7 +50,7 @@ int OutputRegisterStreamingLogger(LoggerId id, const char *name,
     ThreadInitFunc ThreadInit, ThreadDeinitFunc ThreadDeinit,
     ThreadExitPrintStatsFunc ThreadExitPrintStats);
 
-void TmModuleStreamingLoggerRegister (void);
+void OutputStreamingLoggerRegister (void);
 
 void OutputStreamingShutdown(void);
 

src/output-tx.c

@@ -335,7 +335,7 @@ static void OutputTxLogExitPrintStats(ThreadVars *tv, void *thread_data)
     }
 }
 
-void TmModuleTxLoggerRegister (void)
+void OutputTxLoggerRegister (void)
 {
     OutputRegisterRootLogger(OutputTxLogThreadInit, OutputTxLogThreadDeinit,
         OutputTxLogExitPrintStats, OutputTxLog);

src/output-tx.h

@@ -43,7 +43,7 @@ int OutputRegisterTxLogger(LoggerId id, const char *name, AppProto alproto,
         ThreadInitFunc, ThreadDeinitFunc,
         void (*ThreadExitPrintStats)(ThreadVars *, void *));
 
-void TmModuleTxLoggerRegister (void);
+void OutputTxLoggerRegister (void);
 
 void OutputTxShutdown(void);
 

src/output.c

@@ -1,4 +1,4 @@
-/* Copyright (C) 2007-2010 Open Information Security Foundation
+/* Copyright (C) 2007-2016 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
  * the GNU General Public License version 2 as published by the Free
@@ -40,6 +40,36 @@
 #include "util-debug.h"
 #include "output.h"
 
+#include "alert-fastlog.h"
+#include "alert-unified2-alert.h"
+#include "alert-debuglog.h"
+#include "alert-prelude.h"
+#include "alert-syslog.h"
+#include "output-json-alert.h"
+#include "output-json-flow.h"
+#include "output-json-netflow.h"
+#include "log-droplog.h"
+#include "output-json-drop.h"
+#include "log-httplog.h"
+#include "output-json-http.h"
+#include "log-dnslog.h"
+#include "output-json-dns.h"
+#include "log-tlslog.h"
+#include "log-tlsstore.h"
+#include "output-json-tls.h"
+#include "output-json-ssh.h"
+#include "log-pcap.h"
+#include "log-file.h"
+#include "output-json-file.h"
+#include "output-json-smtp.h"
+#include "output-json-stats.h"
+#include "log-filestore.h"
+#include "log-tcp-data.h"
+#include "log-stats.h"
+#include "output-json.h"
+#include "output-json-template.h"
+#include "output-lua.h"
+
 typedef struct RootLogger_ {
     ThreadInitFunc ThreadInit;
     ThreadDeinitFunc ThreadDeinit;
@@ -59,6 +89,9 @@ typedef struct LoggerThreadStoreNode_ {
 
 typedef TAILQ_HEAD(LoggerThreadStore_, LoggerThreadStoreNode_) LoggerThreadStore;
 
+/**
+ * The list of all registered (known) output modules.
+ */
 OutputModuleList output_modules = TAILQ_HEAD_INITIALIZER(output_modules);
 
 /**
@@ -73,6 +106,9 @@ typedef struct OutputFileRolloverFlag_ {
 TAILQ_HEAD(, OutputFileRolloverFlag_) output_file_rotation_flags =
     TAILQ_HEAD_INITIALIZER(output_file_rotation_flags);
 
+void OutputRegisterRootLoggers(void);
+void OutputRegisterLoggers(void);
+
 /**
  * \brief Register an output module.
  *
@@ -984,9 +1020,81 @@ void TmModuleLoggerRegister(void)
     tmm_modules[TMM_LOGGER].ThreadDeinit = OutputLoggerThreadDeinit;
     tmm_modules[TMM_LOGGER].ThreadExitPrintStats = OutputLoggerExitPrintStats;
     tmm_modules[TMM_LOGGER].Func = OutputLoggerLog;;
+
+    OutputRegisterRootLoggers();
+    OutputRegisterLoggers();
 }
 
 void SetupOutputs(ThreadVars *tv)
 {
     TmSlotSetFuncAppend(tv, &tmm_modules[TMM_LOGGER], NULL);
 }
+
+/**
+ * \brief Register all root loggers.
+ */
+void OutputRegisterRootLoggers(void)
+{
+    OutputPacketLoggerRegister();
+    OutputTxLoggerRegister();
+    OutputFileLoggerRegister();
+    OutputFiledataLoggerRegister();
+    OutputStreamingLoggerRegister();
+}
+
+/**
+ * \brief Register all non-root logging modules.
+ */
+void OutputRegisterLoggers(void)
+{
+    LuaLogRegister();
+    /* fast log */
+    AlertFastLogRegister();
+    /* debug log */
+    AlertDebugLogRegister();
+    /* prelue log */
+    AlertPreludeRegister();
+    /* syslog log */
+    AlertSyslogRegister();
+    /* unified2 log */
+    Unified2AlertRegister();
+    /* drop log */
+    LogDropLogRegister();
+    JsonDropLogRegister();
+    /* json log */
+    OutputJsonRegister();
+    /* email logs */
+    JsonSmtpLogRegister();
+    /* http log */
+    LogHttpLogRegister();
+    JsonHttpLogRegister();
+    /* tls log */
+    LogTlsLogRegister();
+    JsonTlsLogRegister();
+    LogTlsStoreRegister();
+    /* ssh */
+    JsonSshLogRegister();
+    /* pcap log */
+    PcapLogRegister();
+    /* file log */
+    LogFileLogRegister();
+    JsonFileLogRegister();
+    LogFilestoreRegister();
+    /* dns log */
+    LogDnsLogRegister();
+    JsonDnsLogRegister();
+    /* tcp streaming data */
+    LogTcpDataLogRegister();
+    /* log stats */
+    LogStatsLogRegister();
+
+    JsonAlertLogRegister();
+    /* flow/netflow */
+    JsonFlowLogRegister();
+    JsonNetFlowLogRegister();
+    /* json stats */
+    JsonStatsLogRegister();
+
+    /* Template JSON logger. */
+    JsonTemplateLogRegister();
+}

src/suricata.c

@@ -73,37 +73,6 @@
 #include "conf.h"
 #include "conf-yaml-loader.h"
 
-#include "alert-fastlog.h"
-#include "alert-unified2-alert.h"
-#include "alert-debuglog.h"
-#include "alert-prelude.h"
-#include "alert-syslog.h"
-#include "output-json-alert.h"
-
-#include "output-json-flow.h"
-#include "output-json-netflow.h"
-#include "log-droplog.h"
-#include "output-json-drop.h"
-#include "log-httplog.h"
-#include "output-json-http.h"
-#include "log-dnslog.h"
-#include "output-json-dns.h"
-#include "log-tlslog.h"
-#include "log-tlsstore.h"
-#include "output-json-tls.h"
-#include "output-json-ssh.h"
-#include "log-pcap.h"
-#include "log-file.h"
-#include "output-json-file.h"
-#include "output-json-smtp.h"
-#include "output-json-stats.h"
-#include "log-filestore.h"
-#include "log-tcp-data.h"
-#include "log-stats.h"
-
-#include "output-json.h"
-
-#include "output-json-template.h"
 
 #include "stream-tcp.h"
 
@@ -186,13 +155,6 @@
 #include "reputation.h"
 
 #include "output.h"
-#include "output-lua.h"
-
-#include "output-packet.h"
-#include "output-tx.h"
-#include "output-file.h"
-#include "output-filedata.h"
-#include "output-streaming.h"
 
 #include "util-privs.h"
 
@@ -867,65 +829,10 @@ void RegisterAllModules()
     /* respond-reject */
     TmModuleRespondRejectRegister();
 
-    TmModuleLuaLogRegister();
-    /* fast log */
-    TmModuleAlertFastLogRegister();
-    /* debug log */
-    TmModuleAlertDebugLogRegister();
-    /* prelue log */
-    TmModuleAlertPreludeRegister();
-    /* syslog log */
-    TmModuleAlertSyslogRegister();
-    /* unified2 log */
-    TmModuleUnified2AlertRegister();
-    /* drop log */
-    TmModuleLogDropLogRegister();
-    TmModuleJsonDropLogRegister();
-    /* json log */
-    TmModuleOutputJsonRegister();
-    /* email logs */
-    TmModuleJsonSmtpLogRegister();
-    /* http log */
-    TmModuleLogHttpLogRegister();
-    TmModuleJsonHttpLogRegister();
-    /* tls log */
-    TmModuleLogTlsLogRegister();
-    TmModuleJsonTlsLogRegister();
-    TmModuleLogTlsStoreRegister();
-    /* ssh */
-    TmModuleJsonSshLogRegister();
-    /* pcap log */
-    TmModulePcapLogRegister();
-    /* file log */
-    TmModuleLogFileLogRegister();
-    TmModuleJsonFileLogRegister();
-    TmModuleLogFilestoreRegister();
-    /* dns log */
-    TmModuleLogDnsLogRegister();
-    TmModuleJsonDnsLogRegister();
-    /* tcp streaming data */
-    TmModuleLogTcpDataLogRegister();
-    /* log stats */
-    TmModuleLogStatsLogRegister();
-
-    TmModuleJsonAlertLogRegister();
-    /* flow/netflow */
-    TmModuleJsonFlowLogRegister();
-    TmModuleJsonNetFlowLogRegister();
-    /* json stats */
-    TmModuleJsonStatsLogRegister();
-
-    /* Template JSON logger. */
-    TmModuleJsonTemplateLogRegister();
-
     /* log api */
     TmModuleLoggerRegister();
-    TmModulePacketLoggerRegister();
-    TmModuleTxLoggerRegister();
-    TmModuleFileLoggerRegister();
-    TmModuleFiledataLoggerRegister();
-    TmModuleStreamingLoggerRegister();
     TmModuleStatsLoggerRegister();
+
     TmModuleDebugList();
     /* nflog */
     TmModuleReceiveNFLOGRegister();
@@ -2412,8 +2319,6 @@ static int PostConfLoadedSetup(SCInstance *suri)
 
     TmModuleRunInit();
 
-    PcapLogProfileSetup();
-
     if (MayDaemonize(suri) != TM_ECODE_OK)
         SCReturnInt(TM_ECODE_FAILED);