mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Refactor script/server into an object that inherits from Rack::Server
This commit is contained in:
parent
58dec09353
commit
a080323cb0
2 changed files with 66 additions and 63 deletions
|
@ -1,25 +1,21 @@
|
||||||
require 'action_dispatch'
|
|
||||||
|
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
require 'optparse'
|
require 'optparse'
|
||||||
|
require 'action_dispatch'
|
||||||
|
|
||||||
options = {
|
module Rails
|
||||||
:Port => 3000,
|
class Server < ::Rack::Server
|
||||||
:Host => "0.0.0.0",
|
class Options
|
||||||
:environment => (ENV['RAILS_ENV'] || "development").dup,
|
def parse!(args)
|
||||||
:config => "#{Rails.root}/config.ru",
|
options = {}
|
||||||
:detach => false,
|
args = args.dup
|
||||||
:debugger => false
|
opt_parser = OptionParser.new do |opts|
|
||||||
}
|
|
||||||
|
|
||||||
ARGV.clone.options do |opts|
|
|
||||||
opts.on("-p", "--port=port", Integer,
|
opts.on("-p", "--port=port", Integer,
|
||||||
"Runs Rails on the specified port.", "Default: #{options[:Port]}") { |v| options[:Port] = v }
|
"Runs Rails on the specified port.", "Default: #{options[:Port]}") { |v| options[:Port] = v }
|
||||||
opts.on("-b", "--binding=ip", String,
|
opts.on("-b", "--binding=ip", String,
|
||||||
"Binds Rails to the specified ip.", "Default: #{options[:Host]}") { |v| options[:Host] = v }
|
"Binds Rails to the specified ip.", "Default: #{options[:Host]}") { |v| options[:Host] = v }
|
||||||
opts.on("-c", "--config=file", String,
|
opts.on("-c", "--config=file", String,
|
||||||
"Use custom rackup configuration file") { |v| options[:config] = v }
|
"Use custom rackup configuration file") { |v| options[:config] = v }
|
||||||
opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:detach] = true }
|
opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:daemonize] = true }
|
||||||
opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
|
opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = true }
|
||||||
opts.on("-e", "--environment=name", String,
|
opts.on("-e", "--environment=name", String,
|
||||||
"Specifies the environment to run this server under (test/development/production).",
|
"Specifies the environment to run this server under (test/development/production).",
|
||||||
|
@ -28,46 +24,52 @@ ARGV.clone.options do |opts|
|
||||||
opts.separator ""
|
opts.separator ""
|
||||||
|
|
||||||
opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
|
opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
|
||||||
|
|
||||||
opts.parse!
|
|
||||||
end
|
end
|
||||||
|
|
||||||
server = Rack::Handler.get(ARGV.first) rescue nil
|
opt_parser.parse! args
|
||||||
unless server
|
|
||||||
begin
|
options[:server] = args.shift
|
||||||
server = Rack::Handler::Mongrel
|
options
|
||||||
rescue LoadError => e
|
|
||||||
server = Rack::Handler::WEBrick
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def opt_parser
|
||||||
|
Options.new
|
||||||
|
end
|
||||||
|
|
||||||
|
def start
|
||||||
puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
|
puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
|
||||||
puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}"
|
puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}"
|
||||||
|
puts "=> Call with -d to detach" unless options[:daemonize]
|
||||||
if options[:detach]
|
trap(:INT) { exit }
|
||||||
Process.daemon
|
puts "=> Ctrl-C to shutdown server" unless options[:daemonize]
|
||||||
pid = "#{Rails.root}/tmp/pids/server.pid"
|
|
||||||
File.open(pid, 'w'){ |f| f.write(Process.pid) }
|
|
||||||
at_exit { File.delete(pid) if File.exist?(pid) }
|
|
||||||
end
|
|
||||||
|
|
||||||
ENV["RAILS_ENV"] = options[:environment]
|
ENV["RAILS_ENV"] = options[:environment]
|
||||||
RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
|
RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
|
||||||
|
|
||||||
app = Rack::Builder.new {
|
super
|
||||||
use Rails::Rack::LogTailer unless options[:detach]
|
|
||||||
use Rails::Rack::Debugger if options[:debugger]
|
|
||||||
run ActionDispatch::Utils.parse_config(options[:config])
|
|
||||||
}.to_app
|
|
||||||
|
|
||||||
puts "=> Call with -d to detach"
|
|
||||||
|
|
||||||
trap(:INT) { exit }
|
|
||||||
|
|
||||||
puts "=> Ctrl-C to shutdown server"
|
|
||||||
|
|
||||||
begin
|
|
||||||
server.run(app, options.merge(:AccessLog => []))
|
|
||||||
ensure
|
ensure
|
||||||
puts 'Exiting'
|
puts 'Exiting' unless options[:daemonize]
|
||||||
|
end
|
||||||
|
|
||||||
|
def middleware
|
||||||
|
middlewares = []
|
||||||
|
middlewares << [Rails::Rack::LogTailer] unless options[:daemonize]
|
||||||
|
middlewares << [Rails::Rack::Debugger] if options[:debugger]
|
||||||
|
Hash.new(middlewares)
|
||||||
|
end
|
||||||
|
|
||||||
|
def default_options
|
||||||
|
{
|
||||||
|
:Port => 3000,
|
||||||
|
:Host => "0.0.0.0",
|
||||||
|
:environment => (ENV['RAILS_ENV'] || "development").dup,
|
||||||
|
:rack_file => "#{Rails.root}/config.ru",
|
||||||
|
:daemonize => false,
|
||||||
|
:debugger => false,
|
||||||
|
:pid => "#{Rails.root}/tmp/pids/server.pid",
|
||||||
|
:AccessLog => []
|
||||||
|
}
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
require File.expand_path('../../config/application', __FILE__)
|
require File.expand_path('../../config/application', __FILE__)
|
||||||
require 'rails/commands/server'
|
require 'rails/commands/server'
|
||||||
|
Rails::Server.start
|
||||||
|
|
Loading…
Reference in a new issue