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

Make sure we log stuff using logger

Browse source 
Partially addresses #5975

Fixes #5999
This commit is contained in:
Suyog Rao 2016-10-05 18:31:25 +02:00
parent 490da48c22
commit 7da292a3b0
1 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,7 +165,10 @@ class LogStash::Runner < Clamp::StrictCommand
rescue => e
# abort unless we're just looking for the help
if (["--help", "-h"] & args).empty?
$stderr.puts "INFO: 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"
$stderr.puts "INFO: Logstash requires a settings file, 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/..\""
$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
@ -191,6 +194,12 @@ class LogStash::Runner < Clamp::StrictCommand
# override log level that may have been introduced from a custom log4j config file
LogStash::Logging::Logger::configure_logging(setting("log.level"))
# Adding this here because a ton of LS users install LS via packages and try to manually
# start Logstash using bin/logstash. See #5986. I think not logging to console is good for
# services, but until LS users re-learn that logs end up in path.logs, we should keep this
# message. Otherwise we'll be answering the same question again and again.
puts "Sending Logstash logs to #{setting("path.logs")} which is now configured via log4j2.properties."
if setting("config.debug") && logger.debug?
logger.warn("--config.debug was specified, but log.level was not set to \'debug\'! No config info will be logged.")
end
@ -198,14 +207,14 @@ class LogStash::Runner < Clamp::StrictCommand
LogStash::Util::set_thread_name(self.class.name)
if RUBY_VERSION < "1.9.2"
$stderr.puts "Ruby 1.9.2 or later is required. (You are running: " + RUBY_VERSION + ")"
logger.fatal "Ruby 1.9.2 or later is required. (You are running: " + RUBY_VERSION + ")"
return 1
end
# Exit on bad java versions
java_version = LogStash::Util::JavaVersion.version
if LogStash::Util::JavaVersion.bad_java_version?(java_version)
$stderr.puts "Java version 1.8.0 or later is required. (You are running: #{java_version})"
logger.fatal "Java version 1.8.0 or later is required. (You are running: #{java_version})"
return 1
end
@ -237,6 +246,7 @@ class LogStash::Runner < Clamp::StrictCommand
begin
LogStash::Pipeline.new(config_str)
puts "Configuration OK"
logger.info "Using config.test_and_exit mode. Config Validation Result: OK. Exiting Logstash"
return 0
rescue => e
logger.fatal I18n.t("logstash.runner.invalid-configuration", :error => e.message)