提交 221b4aea 编写于 作者: T Tawan Sierek

Avoid multiple default paths to server.pid file

Fix bug (#22811) that occurs when rails server is started in daemon mode
and optional path to the `server.pid` file is omitted. Store default path
in a constant instead of evaluating it multiple time using `File.expand_path`.

The bug in detail: The server startup procedure crashes, since it tries to
open a file at `/tmp/pids/server.pid` instead of
`<path to project>/tmp/pids/server.pid`. This bug was introduced in 51211a94
when Rack was upgraded from version 1.x to 2.x. Since version 2.x,
Rack does not memoize the options hash [1], and as a consequence
`Rails::Server#default_options` will be evaluated multiple times.
The hash returned by `Rails::Server#default_options` holds the default path
to the `server.pid` file. The path is generated with the method
`File.expand_path`. However, the return value of this method depends on the
current working directory [2], which changes once `Process.daemon` is invoked
by `Rack::Server#daemonize_app` and the process is detached from the current
shell.

Close #22811

[1]https://git.io/vzen2
[2]http://ruby-doc.org/core-2.1.5/File.html#method-c-expand_path
上级 39f383ba
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
module Rails module Rails
class Server < ::Rack::Server class Server < ::Rack::Server
class Options class Options
DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze
def parse!(args) def parse!(args)
args, options = args.dup, {} args, options = args.dup, {}
...@@ -91,7 +93,7 @@ def default_options ...@@ -91,7 +93,7 @@ def default_options
environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup, environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
daemonize: false, daemonize: false,
caching: false, caching: false,
pid: File.expand_path("tmp/pids/server.pid") pid: Options::DEFAULT_PID_PATH
}) })
end end
......
...@@ -108,4 +108,13 @@ def test_log_stdout ...@@ -108,4 +108,13 @@ def test_log_stdout
end end
end end
end end
def test_default_options
server = Rails::Server.new
old_default_options = server.default_options
Dir.chdir("..") do
assert_equal old_default_options, server.default_options
end
end
end end
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册