github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

don't warn of wrong path.settings with --help

Browse source 
Fixes #5786
This commit is contained in:
Joao Duarte 2016-08-22 15:42:07 +01:00 • committed by João Duarte
parent 0d19958379
commit 1fbebe4779
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -148,12 +148,13 @@ class LogStash::Runner < Clamp::StrictCommand
begin begin
LogStash::SETTINGS.from_yaml(LogStash::SETTINGS.get("path.settings")) LogStash::SETTINGS.from_yaml(LogStash::SETTINGS.get("path.settings"))
rescue => e rescue => e
# abort unless we're just looking for the help
if (["--help", "-h"] & args).empty?
@logger.subscribe(STDOUT) @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.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) @logger.fatal("Failed to load settings file from \"path.settings\". Aborting...", "path.settings" => LogStash::SETTINGS.get("path.settings"), "exception" => e.class, "message" => e.message)
return 1
# abort unless we're just looking for the help end
return(1) if (["--help", "-h"] & args).empty?
end end
super(*[args]) super(*[args])