From: Jeff Lucovsky Date: Wed, 12 Aug 2020 13:50:09 +0000 (-0400) Subject: log: Remove standalone output registration X-Git-Tag: suricata-6.0.0-rc1~88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15caf3eea5e62131930af443025b37a6b246416c;p=thirdparty%2Fsuricata.git log: Remove standalone output registration Remove standalone output logger registration since eve is multi-instance. --- diff --git a/src/output-json-alert.c b/src/output-json-alert.c index 60585f6ac3..f875306d5c 100644 --- a/src/output-json-alert.c +++ b/src/output-json-alert.c @@ -1076,9 +1076,6 @@ error: void JsonAlertLogRegister (void) { - OutputRegisterPacketModule(LOGGER_JSON_ALERT, MODULE_NAME, "alert-json-log", - JsonAlertLogInitCtx, JsonAlertLogger, JsonAlertLogCondition, - JsonAlertLogThreadInit, JsonAlertLogThreadDeinit, NULL); OutputRegisterPacketSubModule(LOGGER_JSON_ALERT, "eve-log", MODULE_NAME, "eve-log.alert", JsonAlertLogInitCtxSub, JsonAlertLogger, JsonAlertLogCondition, JsonAlertLogThreadInit, JsonAlertLogThreadDeinit, diff --git a/src/output-json-dns.c b/src/output-json-dns.c index a97021a8bb..99ab987ac0 100644 --- a/src/output-json-dns.c +++ b/src/output-json-dns.c @@ -712,16 +712,6 @@ static OutputInitResult JsonDnsLogInitCtx(ConfNode *conf) #define MODULE_NAME "JsonDnsLog" void JsonDnsLogRegister (void) { - /* Logger for requests. */ - OutputRegisterTxModuleWithProgress(LOGGER_JSON_DNS_TS, MODULE_NAME, - "dns-json-log", JsonDnsLogInitCtx, ALPROTO_DNS, JsonDnsLoggerToServer, - 0, 1, LogDnsLogThreadInit, LogDnsLogThreadDeinit, NULL); - - /* Logger for replies. */ - OutputRegisterTxModuleWithProgress(LOGGER_JSON_DNS_TC, MODULE_NAME, - "dns-json-log", JsonDnsLogInitCtx, ALPROTO_DNS, JsonDnsLoggerToClient, - 1, 1, LogDnsLogThreadInit, LogDnsLogThreadDeinit, NULL); - /* Sub-logger for requests. */ OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_DNS_TS, "eve-log", MODULE_NAME, "eve-log.dns", JsonDnsLogInitCtxSub, ALPROTO_DNS, diff --git a/src/output-json-drop.c b/src/output-json-drop.c index ecfbb41e94..db44df7fee 100644 --- a/src/output-json-drop.c +++ b/src/output-json-drop.c @@ -445,9 +445,6 @@ static int JsonDropLogCondition(ThreadVars *tv, const Packet *p) void JsonDropLogRegister (void) { - OutputRegisterPacketModule(LOGGER_JSON_DROP, MODULE_NAME, "drop-json-log", - JsonDropLogInitCtx, JsonDropLogger, JsonDropLogCondition, - JsonDropLogThreadInit, JsonDropLogThreadDeinit, NULL); OutputRegisterPacketSubModule(LOGGER_JSON_DROP, "eve-log", MODULE_NAME, "eve-log.drop", JsonDropLogInitCtxSub, JsonDropLogger, JsonDropLogCondition, JsonDropLogThreadInit, JsonDropLogThreadDeinit, diff --git a/src/output-json-flow.c b/src/output-json-flow.c index c830249b34..7d0e51704b 100644 --- a/src/output-json-flow.c +++ b/src/output-json-flow.c @@ -479,12 +479,7 @@ static TmEcode JsonFlowLogThreadDeinit(ThreadVars *t, void *data) void JsonFlowLogRegister (void) { - /* register as separate module */ - OutputRegisterFlowModule(LOGGER_JSON_FLOW, "JsonFlowLog", "flow-json-log", - OutputFlowLogInit, JsonFlowLogger, JsonFlowLogThreadInit, - JsonFlowLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterFlowSubModule(LOGGER_JSON_FLOW, "eve-log", "JsonFlowLog", "eve-log.flow", OutputFlowLogInitSub, JsonFlowLogger, JsonFlowLogThreadInit, JsonFlowLogThreadDeinit, NULL); diff --git a/src/output-json-http.c b/src/output-json-http.c index 695e34cb61..5675a9d9f4 100644 --- a/src/output-json-http.c +++ b/src/output-json-http.c @@ -793,12 +793,7 @@ static TmEcode JsonHttpLogThreadDeinit(ThreadVars *t, void *data) void JsonHttpLogRegister (void) { - /* register as separate module */ - OutputRegisterTxModule(LOGGER_JSON_HTTP, "JsonHttpLog", "http-json-log", - OutputHttpLogInit, ALPROTO_HTTP, JsonHttpLogger, JsonHttpLogThreadInit, - JsonHttpLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterTxSubModule(LOGGER_JSON_HTTP, "eve-log", "JsonHttpLog", "eve-log.http", OutputHttpLogInitSub, ALPROTO_HTTP, JsonHttpLogger, JsonHttpLogThreadInit, JsonHttpLogThreadDeinit, NULL); diff --git a/src/output-json-metadata.c b/src/output-json-metadata.c index 415f24de4f..8e5dcf9248 100644 --- a/src/output-json-metadata.c +++ b/src/output-json-metadata.c @@ -270,20 +270,12 @@ error: void JsonMetadataLogRegister (void) { - OutputRegisterPacketModule(LOGGER_JSON_METADATA, MODULE_NAME, - "metadata-json-log", JsonMetadataLogInitCtx, JsonMetadataLogger, - JsonMetadataLogCondition, JsonMetadataLogThreadInit, - JsonMetadataLogThreadDeinit, NULL); OutputRegisterPacketSubModule(LOGGER_JSON_METADATA, "eve-log", MODULE_NAME, "eve-log.metadata", JsonMetadataLogInitCtxSub, JsonMetadataLogger, JsonMetadataLogCondition, JsonMetadataLogThreadInit, JsonMetadataLogThreadDeinit, NULL); /* Kept for compatibility. */ - OutputRegisterPacketModule(LOGGER_JSON_METADATA, MODULE_NAME, - "vars-json-log", JsonMetadataLogInitCtx, JsonMetadataLogger, - JsonMetadataLogCondition, JsonMetadataLogThreadInit, - JsonMetadataLogThreadDeinit, NULL); OutputRegisterPacketSubModule(LOGGER_JSON_METADATA, "eve-log", MODULE_NAME, "eve-log.vars", JsonMetadataLogInitCtxSub, JsonMetadataLogger, JsonMetadataLogCondition, JsonMetadataLogThreadInit, diff --git a/src/output-json-netflow.c b/src/output-json-netflow.c index 51acf10e3e..b162a67812 100644 --- a/src/output-json-netflow.c +++ b/src/output-json-netflow.c @@ -437,12 +437,7 @@ static TmEcode JsonNetFlowLogThreadDeinit(ThreadVars *t, void *data) void JsonNetFlowLogRegister(void) { - /* register as separate module */ - OutputRegisterFlowModule(LOGGER_JSON_NETFLOW, "JsonNetFlowLog", - "netflow-json-log", OutputNetFlowLogInit, JsonNetFlowLogger, - JsonNetFlowLogThreadInit, JsonNetFlowLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterFlowSubModule(LOGGER_JSON_NETFLOW, "eve-log", "JsonNetFlowLog", "eve-log.netflow", OutputNetFlowLogInitSub, JsonNetFlowLogger, JsonNetFlowLogThreadInit, JsonNetFlowLogThreadDeinit, NULL); diff --git a/src/output-json-smtp.c b/src/output-json-smtp.c index cccf7ce81e..1cd94283cc 100644 --- a/src/output-json-smtp.c +++ b/src/output-json-smtp.c @@ -254,12 +254,7 @@ static TmEcode JsonSmtpLogThreadDeinit(ThreadVars *t, void *data) } void JsonSmtpLogRegister (void) { - /* register as separate module */ - OutputRegisterTxModule(LOGGER_JSON_SMTP, "JsonSmtpLog", "smtp-json-log", - OutputSmtpLogInit, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit, - JsonSmtpLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterTxSubModule(LOGGER_JSON_SMTP, "eve-log", "JsonSmtpLog", "eve-log.smtp", OutputSmtpLogInitSub, ALPROTO_SMTP, JsonSmtpLogger, JsonSmtpLogThreadInit, JsonSmtpLogThreadDeinit, NULL); diff --git a/src/output-json-ssh.c b/src/output-json-ssh.c index b8bf1a31f1..25ac338e99 100644 --- a/src/output-json-ssh.c +++ b/src/output-json-ssh.c @@ -233,13 +233,7 @@ static OutputInitResult OutputSshLogInitSub(ConfNode *conf, OutputCtx *parent_ct void JsonSshLogRegister (void) { - /* register as separate module */ - OutputRegisterTxModuleWithCondition(LOGGER_JSON_SSH, - "JsonSshLog", "ssh-json-log", - OutputSshLogInit, ALPROTO_SSH, JsonSshLogger, - SSHTxLogCondition, JsonSshLogThreadInit, JsonSshLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterTxSubModuleWithCondition(LOGGER_JSON_SSH, "eve-log", "JsonSshLog", "eve-log.ssh", OutputSshLogInitSub, ALPROTO_SSH, JsonSshLogger, diff --git a/src/output-json-stats.c b/src/output-json-stats.c index fae2fd2f29..51f194a8c1 100644 --- a/src/output-json-stats.c +++ b/src/output-json-stats.c @@ -534,12 +534,7 @@ static OutputInitResult OutputStatsLogInitSub(ConfNode *conf, OutputCtx *parent_ } void JsonStatsLogRegister(void) { - /* register as separate module */ - OutputRegisterStatsModule(LOGGER_JSON_STATS, MODULE_NAME, "stats-json", - OutputStatsLogInit, JsonStatsLogger, JsonStatsLogThreadInit, - JsonStatsLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterStatsSubModule(LOGGER_JSON_STATS, "eve-log", MODULE_NAME, "eve-log.stats", OutputStatsLogInitSub, JsonStatsLogger, JsonStatsLogThreadInit, JsonStatsLogThreadDeinit, NULL); diff --git a/src/output-json-tls.c b/src/output-json-tls.c index a4ddd7a9d8..92f2656893 100644 --- a/src/output-json-tls.c +++ b/src/output-json-tls.c @@ -649,15 +649,9 @@ static OutputInitResult OutputTlsLogInitSub(ConfNode *conf, OutputCtx *parent_ct void JsonTlsLogRegister (void) { - /* register as separate module */ - OutputRegisterTxModuleWithProgress(LOGGER_JSON_TLS, "JsonTlsLog", - "tls-json-log", OutputTlsLogInit, ALPROTO_TLS, JsonTlsLogger, - TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE, JsonTlsLogThreadInit, - JsonTlsLogThreadDeinit, NULL); - - /* also register as child of eve-log */ + /* register as child of eve-log */ OutputRegisterTxSubModuleWithProgress(LOGGER_JSON_TLS, "eve-log", "JsonTlsLog", "eve-log.tls", OutputTlsLogInitSub, ALPROTO_TLS, JsonTlsLogger, TLS_HANDSHAKE_DONE, TLS_HANDSHAKE_DONE, JsonTlsLogThreadInit, JsonTlsLogThreadDeinit, NULL); -} \ No newline at end of file +}