github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-23 22:27:21 -04:00
Code Issues Projects Releases Packages Wiki Activity

create source_loader after logging setup

Browse source 
Fixes #7970
This commit is contained in:
Joao Duarte 2017-08-10 12:53:22 +01:00 • committed by João Duarte
parent 6d3cd9d660
commit bb392113cf
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
logstash-core/lib/logstash/runner.rb
View file

@ -190,12 +190,6 @@ class LogStash::Runner < Clamp::StrictCommand
@settings = LogStash::SETTINGS
@bootstrap_checks = DEFAULT_BOOTSTRAP_CHECKS.dup
# Default we check local sources: `-e`, `-f` and the logstash.yml options.
@source_loader = LogStash::Config::SourceLoader.new(@settings)
@source_loader.add_source(LogStash::Config::Source::Local.new(@settings))
@source_loader.add_source(LogStash::Config::Source::Modules.new(@settings))
@source_loader.add_source(LogStash::Config::Source::MultiLocal.new(@settings))
super(*args)
end
@ -256,6 +250,12 @@ class LogStash::Runner < Clamp::StrictCommand
return 0
end
# Default we check local sources: `-e`, `-f` and the logstash.yml options.
@source_loader = LogStash::Config::SourceLoader.new(@settings)
@source_loader.add_source(LogStash::Config::Source::Local.new(@settings))
@source_loader.add_source(LogStash::Config::Source::Modules.new(@settings))
@source_loader.add_source(LogStash::Config::Source::MultiLocal.new(@settings))
# Add local modules to the registry before everything else
LogStash::Modules::Util.register_local_modules(LogStash::Environment::LOGSTASH_HOME)