Merge pull request #27601 from y-yagi/make_work_all_commands_from_engine

Make all rails commands work in engine

1 files changed, 6 insertions, 2 deletions

diff --git a/railties/lib/rails/commands/server/server_command.rb b/railties/lib/rails/commands/server/server_command.rb
index 15c636103b..d58721f648 100644
--- a/railties/lib/rails/commands/server/server_command.rb
+++ b/railties/lib/rails/commands/server/server_command.rb
@@ -95,7 +95,7 @@ module Rails
 
   module Command
     class ServerCommand < Base # :nodoc:
-      DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze
+      DEFAULT_PID_PATH = "tmp/pids/server.pid".freeze
 
       class_option :port, aliases: "-p", type: :numeric,
         desc: "Runs Rails on the specified port.", banner: :port, default: 3000
@@ -141,7 +141,7 @@ module Rails
             config:             options[:config],
             environment:        environment,
             daemonize:          options[:daemon],
-            pid:                options[:pid],
+            pid:                pid,
             caching:            options["dev-caching"],
             restart_cmd:        restart_command
           }
@@ -165,6 +165,10 @@ module Rails
           "bin/rails server #{@server} #{@original_options.join(" ")}"
         end
 
+        def pid
+          File.expand_path(options[:pid])
+        end
+
         def self.banner(*)
           "rails server [puma, thin etc] [options]"
         end