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

tolerate incorrect path.settings value

Browse source 
Fixes #5393
This commit is contained in:
Joao Duarte 2016-05-30 18:16:27 +01:00 • committed by João Duarte
parent db2b40c9ed
commit 1520a36cd4
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,12 @@ class LogStash::Runner < Clamp::StrictCommand
@settings.set("path.settings", settings_path) if settings_path @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."
end
super(*[args]) super(*[args])
end end