diff --git a/src/output-json.c b/src/output-json.c index f9f8a6b495..226271a9f1 100644 --- a/src/output-json.c +++ b/src/output-json.c @@ -91,6 +91,10 @@ void OutputJsonRegister (void) traffic_id_prefix_len = strlen(TRAFFIC_ID_PREFIX); traffic_label_prefix_len = strlen(TRAFFIC_LABEL_PREFIX); + + // Register output file types that use the new eve filetype registration + // API. + SyslogInitialize(); } json_t *SCJsonString(const char *val) diff --git a/src/suricata.c b/src/suricata.c index 9efea7780e..eb9a3a2580 100644 --- a/src/suricata.c +++ b/src/suricata.c @@ -2555,7 +2555,6 @@ int PostConfLoadedSetup(SCInstance *suri) FeatureTrackingRegister(); /* must occur prior to output mod registration */ RegisterAllModules(); #ifdef HAVE_PLUGINS - SCInternalLoad(); SCPluginsLoad(suri->capture_plugin_name, suri->capture_plugin_args); #endif AppLayerHtpNeedFileInspection(); diff --git a/src/util-plugin.c b/src/util-plugin.c index deb5333cbf..087b55dd2e 100644 --- a/src/util-plugin.c +++ b/src/util-plugin.c @@ -86,14 +86,6 @@ static void InitPlugin(char *path) } } -/** - * \brief Load internal plugins - */ -void SCInternalLoad(void) -{ - SyslogInitialize(); -} - void SCPluginsLoad(const char *capture_plugin_name, const char *capture_plugin_args) { ConfNode *conf = ConfGetNode("plugins"); diff --git a/src/util-plugin.h b/src/util-plugin.h index 21654d86e6..cafe314f75 100644 --- a/src/util-plugin.h +++ b/src/util-plugin.h @@ -21,7 +21,6 @@ #include "suricata-plugin.h" #include "output-eve-syslog.h" -void SCInternalLoad(void); void SCPluginsLoad(const char *capture_plugin_name, const char *capture_plugin_args); SCEveFileType *SCPluginFindFileType(const char *name); SCCapturePlugin *SCPluginFindCaptureByName(const char *name);