1 files changed, 30 insertions, 22 deletions

diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 77b6c1f65d..2c5440d9ec 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "fileutils"
-require "optparse"
 require "action_dispatch"
 require "rails"
 require "active_support/deprecation"
@@ -98,10 +97,6 @@ module Rails
         end
       end
 
-      def restart_command
-        "bin/rails server #{ARGV.join(' ')}"
-      end
-
       def use_puma?
         server.to_s == "Rack::Handler::Puma"
       end
@@ -133,16 +128,18 @@ module Rails
         desc: "Specifies the Rack server used to run the application (thin/puma/webrick).", banner: :name
       class_option :pid, aliases: "-P", type: :string, default: DEFAULT_PID_PATH,
         desc: "Specifies the PID file."
-      class_option "dev-caching", aliases: "-C", type: :boolean, default: nil,
+      class_option :dev_caching, aliases: "-C", type: :boolean, default: nil,
         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 :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 = {}, config = {})
-        @original_options = local_options
+      def initialize(args, local_options, *)
         super
-        @using = deprecated_positional_rack_server(using) || options[:using]
-        @log_stdout = options[:daemon].blank? && (options[:environment] || Rails.env) == "development"
+
+        @original_options = local_options - %w( --restart )
+        deprecate_positional_rack_server_and_rewrite_to_option(@original_options)
       end
 
       def perform
@@ -170,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,
@@ -178,7 +175,7 @@ module Rails
             environment:           environment,
             daemonize:             options[:daemon],
             pid:                   pid,
-            caching:               options["dev-caching"],
+            caching:               options[:dev_caching],
             restart_cmd:           restart_command,
             early_hints:           early_hints
           }
@@ -211,7 +208,7 @@ module Rails
                   name = :Port
                 when :binding
                   name = :Host
-                when :"dev-caching"
+                when :dev_caching
                   name = :caching
                 when :daemonize
                   name = :daemon
@@ -253,13 +250,19 @@ module Rails
         end
 
         def restart_command
-          "bin/rails server #{using} #{@original_options.join(" ")} --restart"
+          "bin/rails server #{@original_options.join(" ")} --restart"
         end
 
         def early_hints
           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
@@ -272,14 +275,19 @@ module Rails
           FileUtils.rm_f(options[:pid]) if options[:restart]
         end
 
-        def deprecated_positional_rack_server(value)
-          if value
-            ActiveSupport::Deprecation.warn(<<-MSG.squish)
+        def deprecate_positional_rack_server_and_rewrite_to_option(original_options)
+          if using
+            ActiveSupport::Deprecation.warn(<<~MSG)
               Passing the Rack server name as a regular argument is deprecated
               and will be removed in the next Rails version. Please, use the -u
               option instead.
             MSG
-            value
+
+            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.
+            @using = options[:using]
           end
         end
 
@@ -293,10 +301,10 @@ module Rails
               Run `rails server --help` for more options.
             MSG
           else
-            suggestions = Rails::Command::Spellchecker.suggest(server, from: RACK_SERVERS)
+            suggestion = Rails::Command::Spellchecker.suggest(server, from: RACK_SERVERS)
 
             <<~MSG
-              Could not find server "#{server}". Maybe you meant #{suggestions.inspect}?
+              Could not find server "#{server}". Maybe you meant #{suggestion.inspect}?
               Run `rails server --help` for more options.
             MSG
           end