pick a server, any server!
This commit is contained in:
parent
39cee5c8da
commit
f747bfe403
|
@ -2,3 +2,4 @@ doc
|
||||||
pkg
|
pkg
|
||||||
*.log
|
*.log
|
||||||
.DS_Store
|
.DS_Store
|
||||||
|
rack*
|
|
@ -120,12 +120,32 @@ module Sinatra
|
||||||
app
|
app
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def server
|
||||||
|
@server ||= case options.server
|
||||||
|
when "mongrel"
|
||||||
|
Rack::Handler::Mongrel
|
||||||
|
when "webrick"
|
||||||
|
Rack::Handler::WEBrick
|
||||||
|
when "cgi"
|
||||||
|
Rack::Handler::CGI
|
||||||
|
when "fastcgi"
|
||||||
|
Rack::Handler::FastCGI
|
||||||
|
else
|
||||||
|
if defined?(Rack::Handler::Thin)
|
||||||
|
Rack::Handler::Thin
|
||||||
|
else
|
||||||
|
options.server ||= "mongrel"
|
||||||
|
eval("Rack::Handler::#{options.server.capitalize}")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
def run
|
def run
|
||||||
|
|
||||||
begin
|
begin
|
||||||
puts "== Sinatra has taken the stage on port #{port} for #{env}"
|
puts "== Sinatra has taken the stage on port #{port} for #{env} with backup by #{server.name}"
|
||||||
require 'pp'
|
require 'pp'
|
||||||
Rack::Handler::Mongrel.run(build_application, :Port => port) do |server|
|
server.run(build_application, :Port => port) do |server|
|
||||||
trap(:INT) do
|
trap(:INT) do
|
||||||
server.stop
|
server.stop
|
||||||
puts "\n== Sinatra has ended his set (crowd applauds)"
|
puts "\n== Sinatra has ended his set (crowd applauds)"
|
||||||
|
@ -722,7 +742,8 @@ module Sinatra
|
||||||
OptionParser.new do |op|
|
OptionParser.new do |op|
|
||||||
op.on('-p port') { |port| default_options[:port] = port }
|
op.on('-p port') { |port| default_options[:port] = port }
|
||||||
op.on('-e env') { |env| default_options[:env] = env }
|
op.on('-e env') { |env| default_options[:env] = env }
|
||||||
op.on('-x') { |env| default_options[:mutex] = true }
|
op.on('-x') { default_options[:mutex] = true }
|
||||||
|
op.on('-s server') { |server| default_options[:server] = server }
|
||||||
end.parse!(ARGV.dup.select { |o| o !~ /--name/ })
|
end.parse!(ARGV.dup.select { |o| o !~ /--name/ })
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue