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

Fix user feedback message for package install

Browse source 
We were showing both INFO and ERROR for all cases which is confusing

Fixes #6061
This commit is contained in:
Suyog Rao 2016-10-14 17:46:39 -07:00
parent df713c068c
commit 8bf84c74c4
2 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -162,10 +162,14 @@ class LogStash::Runner < Clamp::StrictCommand
begin
LogStash::SETTINGS.from_yaml(LogStash::SETTINGS.get("path.settings"))
rescue Errno::ENOENT
unless cli_help?(args)
$stderr.puts "ERROR: Logstash requires a setting file which 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 --path.settings /etc/logstash"
return 1
end
rescue => e
# abort unless we're just looking for the help
if (["--help", "-h"] & args).empty?
$stderr.puts "INFO: Logstash requires a setting file which 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/..\""
unless cli_help?(args)
$stderr.puts "ERROR: Failed to load settings file from \"path.settings\". Aborting... path.setting=#{LogStash::SETTINGS.get("path.settings")}, exception=#{e.class}, message=>#{e.message}"
return 1
end
@ -410,5 +414,11 @@ class LogStash::Runner < Clamp::StrictCommand
nil
end
end
# is the user asking for CLI help subcommand?
def cli_help?(args)
# I know, double negative
!(["--help", "-h"] & args).empty?
end
end

3
logstash-core/locales/en.yml
View file

@ -112,8 +112,7 @@ en:
longer available. %{extra} If you have any questions about this, you
are invited to visit https://discuss.elastic.co/c/logstash and ask.
file-not-found: |-
No config files found: %{path}
Can you make sure this path is a logstash config file?
No config files found: %{path}. Can you make sure this path is a logstash config file?
scheme-not-supported: |-
URI scheme not supported: %{path}
Either pass a local file path or "file|http://" URI