From 1520a36cd4b71f933e88c195da1cccc168614e1c Mon Sep 17 00:00:00 2001 From: Joao Duarte Date: Mon, 30 May 2016 18:16:27 +0100 Subject: [PATCH] tolerate incorrect path.settings value Fixes #5393 --- logstash-core/lib/logstash/runner.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/logstash-core/lib/logstash/runner.rb b/logstash-core/lib/logstash/runner.rb index e89945701..4ab76bc5f 100644 --- a/logstash-core/lib/logstash/runner.rb +++ b/logstash-core/lib/logstash/runner.rb @@ -138,7 +138,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")) + rescue => e + puts "Warning: Could not find logstash.yml in 'path.settings' (value: \"#{LogStash::SETTINGS.get("path.settings")}\"), using internal defaults." + end + super(*[args]) end