mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Switch script/server to use rack processor
This commit is contained in:
parent
cc67272cba
commit
708f4c3ae6
5 changed files with 97 additions and 222 deletions
|
@ -1,45 +1,111 @@
|
||||||
require 'active_support'
|
require 'active_support'
|
||||||
require 'fileutils'
|
require 'fileutils'
|
||||||
|
require 'action_controller/vendor/rack'
|
||||||
|
require 'optparse'
|
||||||
|
|
||||||
begin
|
# TODO: Push Thin adapter upstream so we don't need worry about requiring it
|
||||||
require_library_or_gem 'fcgi'
|
|
||||||
rescue Exception
|
|
||||||
# FCGI not available
|
|
||||||
end
|
|
||||||
|
|
||||||
begin
|
|
||||||
require_library_or_gem 'mongrel'
|
|
||||||
rescue Exception
|
|
||||||
# Mongrel not available
|
|
||||||
end
|
|
||||||
|
|
||||||
begin
|
begin
|
||||||
require_library_or_gem 'thin'
|
require_library_or_gem 'thin'
|
||||||
rescue Exception
|
rescue Exception
|
||||||
# Thin not available
|
# Thin not available
|
||||||
end
|
end
|
||||||
|
|
||||||
server = case ARGV.first
|
options = {
|
||||||
when "mongrel", "webrick", "thin"
|
:Port => 3000,
|
||||||
ARGV.shift
|
:Host => "0.0.0.0",
|
||||||
else
|
:environment => (ENV['RAILS_ENV'] || "development").dup,
|
||||||
if defined?(Mongrel)
|
:config => RAILS_ROOT + "/config.ru",
|
||||||
"mongrel"
|
:detach => false,
|
||||||
elsif defined?(Thin)
|
:debugger => false
|
||||||
"thin"
|
}
|
||||||
else
|
|
||||||
"webrick"
|
ARGV.clone.options do |opts|
|
||||||
|
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: 0.0.0.0") { |v| options[:Host] = v }
|
||||||
|
opts.on("-c", "--config=file", String,
|
||||||
|
"Use custom rackup configuration file") { |v| options[:config] = v }
|
||||||
|
opts.on("-d", "--daemon", "Make server run as a Daemon.") { options[:detach] = true }
|
||||||
|
opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { options[:debugger] = 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.separator ""
|
||||||
|
|
||||||
|
opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
|
||||||
|
|
||||||
|
opts.parse!
|
||||||
|
end
|
||||||
|
|
||||||
|
server = Rack::Handler.get(ARGV.first) rescue nil
|
||||||
|
unless server
|
||||||
|
begin
|
||||||
|
server = Rack::Handler::Mongrel
|
||||||
|
rescue LoadError => e
|
||||||
|
server = Rack::Handler::WEBrick
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
case server
|
puts "=> Booting #{ActiveSupport::Inflector.demodulize(server)}"
|
||||||
when "webrick"
|
puts "=> Rails #{Rails.version} application starting on http://#{options[:Host]}:#{options[:Port]}"
|
||||||
puts "=> Booting WEBrick..."
|
|
||||||
when "mongrel"
|
%w(cache pids sessions sockets).each do |dir_to_make|
|
||||||
puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)"
|
FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make))
|
||||||
when "thin"
|
|
||||||
puts "=> Booting Thin (use 'script/server webrick' to force WEBrick)"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
%w(cache pids sessions sockets).each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) }
|
if options[:detach]
|
||||||
require "commands/servers/#{server}"
|
Process.daemon
|
||||||
|
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]
|
||||||
|
RAILS_ENV.replace(options[:environment]) if defined?(RAILS_ENV)
|
||||||
|
require RAILS_ROOT + "/config/environment"
|
||||||
|
|
||||||
|
if File.exist?(options[:config])
|
||||||
|
config = options[:config]
|
||||||
|
if config =~ /\.ru$/
|
||||||
|
cfgfile = File.read(config)
|
||||||
|
if cfgfile[/^#\\(.*)/]
|
||||||
|
opts.parse!($1.split(/\s+/))
|
||||||
|
end
|
||||||
|
app = eval("Rack::Builder.new {( " + cfgfile + "\n )}.to_app", nil, config)
|
||||||
|
else
|
||||||
|
require config
|
||||||
|
app = Object.const_get(File.basename(config, '.rb').capitalize)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
app = Rack::Builder.new {
|
||||||
|
use Rails::Rack::Logger
|
||||||
|
use Rails::Rack::Static
|
||||||
|
run ActionController::Dispatcher.new
|
||||||
|
}.to_app
|
||||||
|
end
|
||||||
|
|
||||||
|
if options[:debugger]
|
||||||
|
begin
|
||||||
|
require_library_or_gem 'ruby-debug'
|
||||||
|
Debugger.start
|
||||||
|
Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
|
||||||
|
puts "=> Debugger enabled"
|
||||||
|
rescue Exception
|
||||||
|
puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
|
||||||
|
exit
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
puts "=> Call with -d to detach"
|
||||||
|
|
||||||
|
trap(:INT) { exit }
|
||||||
|
|
||||||
|
puts "=> Ctrl-C to shutdown server"
|
||||||
|
|
||||||
|
begin
|
||||||
|
server.run(app, options.merge(:AccessLog => []))
|
||||||
|
ensure
|
||||||
|
puts 'Exiting'
|
||||||
|
end
|
||||||
|
|
|
@ -1,31 +0,0 @@
|
||||||
def tail(log_file)
|
|
||||||
cursor = File.size(log_file)
|
|
||||||
last_checked = Time.now
|
|
||||||
tail_thread = Thread.new do
|
|
||||||
File.open(log_file, 'r') do |f|
|
|
||||||
loop do
|
|
||||||
f.seek cursor
|
|
||||||
if f.mtime > last_checked
|
|
||||||
last_checked = f.mtime
|
|
||||||
contents = f.read
|
|
||||||
cursor += contents.length
|
|
||||||
print contents
|
|
||||||
end
|
|
||||||
sleep 1
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
tail_thread
|
|
||||||
end
|
|
||||||
|
|
||||||
def start_debugger
|
|
||||||
begin
|
|
||||||
require_library_or_gem 'ruby-debug'
|
|
||||||
Debugger.start
|
|
||||||
Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
|
|
||||||
puts "=> Debugger enabled"
|
|
||||||
rescue Exception
|
|
||||||
puts "You need to install ruby-debug to run the server in debugging mode. With gems, use 'gem install ruby-debug'"
|
|
||||||
exit
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,69 +0,0 @@
|
||||||
require 'rbconfig'
|
|
||||||
require 'commands/servers/base'
|
|
||||||
|
|
||||||
unless defined?(Mongrel)
|
|
||||||
puts "PROBLEM: Mongrel is not available on your system (or not in your path)"
|
|
||||||
exit 1
|
|
||||||
end
|
|
||||||
|
|
||||||
require 'optparse'
|
|
||||||
|
|
||||||
OPTIONS = {
|
|
||||||
:port => 3000,
|
|
||||||
:ip => "0.0.0.0",
|
|
||||||
:environment => (ENV['RAILS_ENV'] || "development").dup,
|
|
||||||
:detach => false,
|
|
||||||
:debugger => false
|
|
||||||
}
|
|
||||||
|
|
||||||
ARGV.clone.options do |opts|
|
|
||||||
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: 0.0.0.0") { |v| OPTIONS[:ip] = v }
|
|
||||||
opts.on("-d", "--daemon", "Make server run as a Daemon.") { OPTIONS[:detach] = true }
|
|
||||||
opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { OPTIONS[:debugger] = 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.separator ""
|
|
||||||
|
|
||||||
opts.on("-h", "--help", "Show this help message.") { puts opts; exit }
|
|
||||||
|
|
||||||
opts.parse!
|
|
||||||
end
|
|
||||||
|
|
||||||
puts "=> Rails #{Rails.version} application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
|
|
||||||
|
|
||||||
parameters = [
|
|
||||||
"start",
|
|
||||||
"-p", OPTIONS[:port].to_s,
|
|
||||||
"-a", OPTIONS[:ip].to_s,
|
|
||||||
"-e", OPTIONS[:environment],
|
|
||||||
"-P", "#{RAILS_ROOT}/tmp/pids/mongrel.pid"
|
|
||||||
]
|
|
||||||
|
|
||||||
if OPTIONS[:detach]
|
|
||||||
`mongrel_rails #{parameters.join(" ")} -d`
|
|
||||||
else
|
|
||||||
ENV["RAILS_ENV"] = OPTIONS[:environment]
|
|
||||||
RAILS_ENV.replace(OPTIONS[:environment]) if defined?(RAILS_ENV)
|
|
||||||
|
|
||||||
start_debugger if OPTIONS[:debugger]
|
|
||||||
|
|
||||||
puts "=> Call with -d to detach"
|
|
||||||
puts "=> Ctrl-C to shutdown server"
|
|
||||||
|
|
||||||
log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
|
|
||||||
open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
|
|
||||||
tail_thread = tail(log)
|
|
||||||
|
|
||||||
trap(:INT) { exit }
|
|
||||||
|
|
||||||
begin
|
|
||||||
silence_warnings { ARGV = parameters }
|
|
||||||
load("mongrel_rails")
|
|
||||||
ensure
|
|
||||||
tail_thread.kill if tail_thread
|
|
||||||
puts 'Exiting'
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,25 +0,0 @@
|
||||||
require 'rbconfig'
|
|
||||||
require 'commands/servers/base'
|
|
||||||
require 'thin'
|
|
||||||
|
|
||||||
|
|
||||||
options = ARGV.clone
|
|
||||||
options.insert(0,'start') unless Thin::Runner.commands.include?(options[0])
|
|
||||||
|
|
||||||
thin = Thin::Runner.new(options)
|
|
||||||
|
|
||||||
puts "=> Rails #{Rails.version} application starting on http://#{thin.options[:address]}:#{thin.options[:port]}"
|
|
||||||
puts "=> Ctrl-C to shutdown server"
|
|
||||||
|
|
||||||
log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
|
|
||||||
open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
|
|
||||||
tail_thread = tail(log)
|
|
||||||
trap(:INT) { exit }
|
|
||||||
|
|
||||||
begin
|
|
||||||
thin.run!
|
|
||||||
ensure
|
|
||||||
tail_thread.kill if tail_thread
|
|
||||||
puts 'Exiting'
|
|
||||||
end
|
|
||||||
|
|
|
@ -1,66 +0,0 @@
|
||||||
require 'webrick'
|
|
||||||
require 'optparse'
|
|
||||||
require 'commands/servers/base'
|
|
||||||
|
|
||||||
OPTIONS = {
|
|
||||||
:port => 3000,
|
|
||||||
:ip => "0.0.0.0",
|
|
||||||
:environment => (ENV['RAILS_ENV'] || "development").dup,
|
|
||||||
:server_root => File.expand_path(RAILS_ROOT + "/public/"),
|
|
||||||
:server_type => WEBrick::SimpleServer,
|
|
||||||
:charset => "UTF-8",
|
|
||||||
:mime_types => WEBrick::HTTPUtils::DefaultMimeTypes,
|
|
||||||
:debugger => false
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ARGV.options do |opts|
|
|
||||||
script_name = File.basename($0)
|
|
||||||
opts.banner = "Usage: ruby #{script_name} [options]"
|
|
||||||
|
|
||||||
opts.separator ""
|
|
||||||
|
|
||||||
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: 0.0.0.0") { |v| OPTIONS[:ip] = v }
|
|
||||||
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("-m", "--mime-types=filename", String,
|
|
||||||
"Specifies an Apache style mime.types configuration file to be used for mime types",
|
|
||||||
"Default: none") { |mime_types_file| OPTIONS[:mime_types] = WEBrick::HTTPUtils::load_mime_types(mime_types_file) }
|
|
||||||
|
|
||||||
opts.on("-d", "--daemon",
|
|
||||||
"Make Rails run as a Daemon (only works if fork is available -- meaning on *nix)."
|
|
||||||
) { OPTIONS[:server_type] = WEBrick::Daemon }
|
|
||||||
|
|
||||||
opts.on("-u", "--debugger", "Enable ruby-debugging for the server.") { OPTIONS[:debugger] = true }
|
|
||||||
|
|
||||||
opts.on("-c", "--charset=charset", String,
|
|
||||||
"Set default charset for output.",
|
|
||||||
"Default: UTF-8") { |v| OPTIONS[:charset] = v }
|
|
||||||
|
|
||||||
opts.separator ""
|
|
||||||
|
|
||||||
opts.on("-h", "--help",
|
|
||||||
"Show this help message.") { puts opts; exit }
|
|
||||||
|
|
||||||
opts.parse!
|
|
||||||
end
|
|
||||||
|
|
||||||
start_debugger if OPTIONS[:debugger]
|
|
||||||
|
|
||||||
ENV["RAILS_ENV"] = OPTIONS[:environment]
|
|
||||||
RAILS_ENV.replace(OPTIONS[:environment]) if defined?(RAILS_ENV)
|
|
||||||
|
|
||||||
require RAILS_ROOT + "/config/environment"
|
|
||||||
require 'webrick_server'
|
|
||||||
|
|
||||||
OPTIONS['working_directory'] = File.expand_path(RAILS_ROOT)
|
|
||||||
|
|
||||||
puts "=> Rails #{Rails.version} application started on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
|
|
||||||
puts "=> Ctrl-C to shutdown server; call with --help for options" if OPTIONS[:server_type] == WEBrick::SimpleServer
|
|
||||||
DispatchServlet.dispatch(OPTIONS)
|
|
Loading…
Reference in a new issue