Skip to content

Commit d3b7837

Browse files
authored
Merge pull request #1717 from fluent/add-ruby-version-to-start-log
Show running ruby version in startup log
2 parents 86eaa2c + b8f0b7e commit d3b7837

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

lib/fluent/supervisor.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ def run_worker
513513
install_main_process_signal_handlers
514514

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

518518
main_process do
519519
create_socket_manager if @standalone_worker
@@ -535,7 +535,7 @@ def create_socket_manager
535535
end
536536

537537
def dry_run_cmd
538-
$log.info "starting fluentd-#{Fluent::VERSION} as dry run mode"
538+
$log.info "starting fluentd-#{Fluent::VERSION} as dry run mode", ruby: RUBY_VERSION
539539
@system_config.suppress_config_dump = true
540540
dry_run
541541
exit 0
@@ -571,7 +571,7 @@ def supervise
571571
dry_run
572572

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

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

0 commit comments

Comments
 (0)