diff options
Diffstat (limited to 'railties/lib/rails/commands/server')
| -rw-r--r-- | railties/lib/rails/commands/server/server_command.rb | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb index 194db23f14..2c5440d9ec 100644 --- a/railties/lib/rails/commands/server/server_command.rb +++ b/railties/lib/rails/commands/server/server_command.rb @@ -132,13 +132,14 @@ module Rails desc: "Specifies whether to perform caching in development." class_option :restart, type: :boolean, default: nil, hide: true class_option :early_hints, type: :boolean, default: nil, desc: "Enables HTTP/2 early hints." + class_option :log_to_stdout, type: :boolean, default: nil, optional: true, + desc: "Whether to log to stdout. Enabled by default in development when not daemonized." def initialize(args, local_options, *) super @original_options = local_options - %w( --restart ) deprecate_positional_rack_server_and_rewrite_to_option(@original_options) - @log_stdout = options[:daemon].blank? && (options[:environment] || Rails.env) == "development" end def perform @@ -166,7 +167,7 @@ module Rails { user_supplied_options: user_supplied_options, server: using, - log_stdout: @log_stdout, + log_stdout: log_to_stdout?, Port: port, Host: host, DoNotReverseLookup: true, @@ -256,6 +257,12 @@ module Rails options[:early_hints] end + def log_to_stdout? + options.fetch(:log_to_stdout) do + options[:daemon].blank? && environment == "development" + end + end + def pid File.expand_path(options[:pid]) end @@ -276,7 +283,7 @@ module Rails option instead. MSG - original_options.concat [ '-u', using ] + original_options.concat [ "-u", using ] else # Use positional internally to get around Thor's immutable options. # TODO: Replace `using` occurences with `options[:using]` after deprecation removal. |