mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
221b4aead5
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 51211a94bd
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
147 lines
4.5 KiB
Ruby
147 lines
4.5 KiB
Ruby
require 'fileutils'
|
|
require 'optparse'
|
|
require 'action_dispatch'
|
|
require 'rails'
|
|
|
|
module Rails
|
|
class Server < ::Rack::Server
|
|
class Options
|
|
DEFAULT_PID_PATH = File.expand_path("tmp/pids/server.pid").freeze
|
|
|
|
def parse!(args)
|
|
args, options = args.dup, {}
|
|
|
|
option_parser(options).parse! args
|
|
|
|
options[:log_stdout] = options[:daemonize].blank? && (options[:environment] || Rails.env) == "development"
|
|
options[:server] = args.shift
|
|
options
|
|
end
|
|
|
|
private
|
|
|
|
def option_parser(options)
|
|
OptionParser.new do |opts|
|
|
opts.banner = "Usage: rails server [mongrel, thin etc] [options]"
|
|
opts.on("-p", "--port=port", Integer,
|
|
"Runs Rails on the specified port.", "Default: 3000") { |v| options[:Port] = v }
|
|
opts.on("-b", "--binding=IP", String,
|
|
"Binds Rails to the specified IP.", "Default: localhost") { |v| options[:Host] = v }
|
|
opts.on("-c", "--config=file", String,
|
|
"Uses a custom rackup configuration.") { |v| options[:config] = v }
|
|
opts.on("-d", "--daemon", "Runs server as a Daemon.") { options[:daemonize] = true }
|
|
opts.on("-e", "--environment=name", String,
|
|
"Specifies the environment to run this server under (test/development/production).",
|
|
"Default: development") { |v| options[:environment] = v }
|
|
opts.on("-P", "--pid=pid", String,
|
|
"Specifies the PID file.",
|
|
"Default: tmp/pids/server.pid") { |v| options[:pid] = v }
|
|
opts.on("-C", "--[no-]dev-caching",
|
|
"Specifies whether to perform caching in development.",
|
|
"true or false") { |v| options[:caching] = v }
|
|
|
|
opts.separator ""
|
|
|
|
opts.on("-h", "--help", "Shows this help message.") { puts opts; exit }
|
|
end
|
|
end
|
|
end
|
|
|
|
def initialize(*)
|
|
super
|
|
set_environment
|
|
end
|
|
|
|
# TODO: this is no longer required but we keep it for the moment to support older config.ru files.
|
|
def app
|
|
@app ||= begin
|
|
app = super
|
|
app.respond_to?(:to_app) ? app.to_app : app
|
|
end
|
|
end
|
|
|
|
def opt_parser
|
|
Options.new
|
|
end
|
|
|
|
def set_environment
|
|
ENV["RAILS_ENV"] ||= options[:environment]
|
|
end
|
|
|
|
def start
|
|
print_boot_information
|
|
trap(:INT) { exit }
|
|
create_tmp_directories
|
|
setup_dev_caching
|
|
log_to_stdout if options[:log_stdout]
|
|
|
|
super
|
|
ensure
|
|
# The '-h' option calls exit before @options is set.
|
|
# If we call 'options' with it unset, we get double help banners.
|
|
puts 'Exiting' unless @options && options[:daemonize]
|
|
end
|
|
|
|
def middleware
|
|
Hash.new([])
|
|
end
|
|
|
|
def default_options
|
|
super.merge({
|
|
Port: ENV.fetch('PORT', 3000).to_i,
|
|
DoNotReverseLookup: true,
|
|
environment: (ENV['RAILS_ENV'] || ENV['RACK_ENV'] || "development").dup,
|
|
daemonize: false,
|
|
caching: false,
|
|
pid: Options::DEFAULT_PID_PATH
|
|
})
|
|
end
|
|
|
|
private
|
|
|
|
def setup_dev_caching
|
|
return unless options[:environment] == "development"
|
|
|
|
if options[:caching] == false
|
|
delete_cache_file
|
|
elsif options[:caching]
|
|
create_cache_file
|
|
end
|
|
end
|
|
|
|
def print_boot_information
|
|
url = "#{options[:SSLEnable] ? 'https' : 'http'}://#{options[:Host]}:#{options[:Port]}"
|
|
puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
|
|
puts "=> Rails #{Rails.version} application starting in #{Rails.env} on #{url}"
|
|
puts "=> Run `rails server -h` for more startup options"
|
|
|
|
puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
|
|
end
|
|
|
|
def create_cache_file
|
|
FileUtils.touch("tmp/caching-dev.txt")
|
|
end
|
|
|
|
def delete_cache_file
|
|
FileUtils.rm("tmp/caching-dev.txt") if File.exist?("tmp/caching-dev.txt")
|
|
end
|
|
|
|
def create_tmp_directories
|
|
%w(cache pids sockets).each do |dir_to_make|
|
|
FileUtils.mkdir_p(File.join(Rails.root, 'tmp', dir_to_make))
|
|
end
|
|
end
|
|
|
|
def log_to_stdout
|
|
wrapped_app # touch the app so the logger is set up
|
|
|
|
console = ActiveSupport::Logger.new(STDOUT)
|
|
console.formatter = Rails.logger.formatter
|
|
console.level = Rails.logger.level
|
|
|
|
unless ActiveSupport::Logger.logger_outputs_to?(Rails.logger, STDOUT)
|
|
Rails.logger.extend(ActiveSupport::Logger.broadcast(console))
|
|
end
|
|
end
|
|
end
|
|
end
|