Skip to content

Commit

Permalink
Merge pull request #1717 from fluent/add-ruby-version-to-start-log
Browse files Browse the repository at this point in the history
Show running ruby version in startup log
  • Loading branch information
repeatedly authored Oct 17, 2017
2 parents 86eaa2c + b8f0b7e commit d3b7837
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/fluent/supervisor.rb
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ def run_worker
install_main_process_signal_handlers

# This is the only log messsage for @standalone_worker
$log.info "starting fluentd-#{Fluent::VERSION} without supervision", pid: Process.pid if @standalone_worker
$log.info "starting fluentd-#{Fluent::VERSION} without supervision", pid: Process.pid, ruby: RUBY_VERSION if @standalone_worker

main_process do
create_socket_manager if @standalone_worker
Expand All @@ -535,7 +535,7 @@ def create_socket_manager
end

def dry_run_cmd
$log.info "starting fluentd-#{Fluent::VERSION} as dry run mode"
$log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
@system_config.suppress_config_dump = true
dry_run
exit 0
Expand Down Expand Up @@ -571,7 +571,7 @@ def supervise
dry_run

Process.setproctitle("supervisor:#{@process_name}") if @process_name
$log.info "starting fluentd-#{Fluent::VERSION}", pid: Process.pid
$log.info "starting fluentd-#{Fluent::VERSION}", pid: Process.pid, ruby: RUBY_VERSION

rubyopt = ENV["RUBYOPT"]
fluentd_spawn_cmd = [ServerEngine.ruby_bin_path, "-Eascii-8bit:ascii-8bit"]
Expand Down

0 comments on commit d3b7837

Please sign in to comment.