ensure 'starting logstash' log entry happens first

This commit is contained in:
Joao Duarte 2020-07-06 11:21:35 +01:00 committed by João Duarte
parent 9fdef56b10
commit 8da85f4384

View file

@ -301,6 +301,8 @@ class LogStash::Runner < Clamp::StrictCommand
return 0 return 0
end end
logger.info("Starting Logstash", "logstash.version" => LOGSTASH_VERSION, "jruby.version" => RUBY_DESCRIPTION)
# Add local modules to the registry before everything else # Add local modules to the registry before everything else
LogStash::Modules::Util.register_local_modules(LogStash::Environment::LOGSTASH_HOME) LogStash::Modules::Util.register_local_modules(LogStash::Environment::LOGSTASH_HOME)
@ -381,8 +383,6 @@ class LogStash::Runner < Clamp::StrictCommand
# lock path.data before starting the agent # lock path.data before starting the agent
@data_path_lock = FileLockFactory.obtainLock(java.nio.file.Paths.get(setting("path.data")).to_absolute_path, ".lock") @data_path_lock = FileLockFactory.obtainLock(java.nio.file.Paths.get(setting("path.data")).to_absolute_path, ".lock")
logger.info("Starting Logstash", "logstash.version" => LOGSTASH_VERSION, "jruby.version" => RUBY_DESCRIPTION)
@dispatcher.fire(:before_agent) @dispatcher.fire(:before_agent)
@agent = create_agent(@settings, @source_loader) @agent = create_agent(@settings, @source_loader)
@dispatcher.fire(:after_agent) @dispatcher.fire(:after_agent)