github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

abort if path.settings does not contain logstash.yml

Browse source 
Fixes #5393
This commit is contained in:
Joao Duarte 2016-05-31 09:53:49 +01:00 • committed by João Duarte
parent 6749c87572
commit 595658f512
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -139,9 +139,12 @@ class LogStash::Runner < Clamp::StrictCommand
@settings.set("path.settings", settings_path) if settings_path
begin
LogStash::SETTINGS.from_yaml(LogStash::SETTINGS.get("path.settings"))
LogStash::SETTINGS.from_yaml(LogStash::SETTINGS.get("path.settings"))
rescue => e
puts "Warning: Could not find logstash.yml in 'path.settings' (value: \"#{LogStash::SETTINGS.get("path.settings")}\"), using internal defaults."
@logger.subscribe(STDOUT)
@logger.warn("Logstash has a new settings file which defines start up time settings. This file is typically located in $LS_HOME/config or /etc/logstash. If you installed Logstash through a package and are starting it manually please specify the location to this settings file by passing in \"--path.settings=/path/..\" in the command line options")
@logger.fatal("Failed to load settings file from \"path.settings\". Aborting...", "path.settings" => LogStash::SETTINGS.get("path.settings"), "exception" => e.class, "message" => e.message)
exit(-1)
end
super(*[args])