Mongrel support for script/server. Closes #5475.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4486 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
b533431ce5
commit
8b89bd779a
@ -1,5 +1,7 @@
|
||||
*SVN*
|
||||
|
||||
* Mongrel support for script/server. #5475 [jeremydurham@gmail.com]
|
||||
|
||||
* Fix script/plugin so it doesn't barf on invalid URLs [Rick]
|
||||
|
||||
* Fix plugin install bug at dir with space. (closes #5359) [Yoshimasa NIWA]
|
||||
|
@ -8,22 +8,25 @@
|
||||
end
|
||||
|
||||
server = case ARGV.first
|
||||
when "lighttpd"
|
||||
ARGV.shift
|
||||
when "webrick"
|
||||
when "lighttpd", "mongrel", "webrick"
|
||||
ARGV.shift
|
||||
else
|
||||
if RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
|
||||
"lighttpd"
|
||||
elsif !silence_stderr { `mongrel_rails -v` }.blank?
|
||||
"mongrel"
|
||||
else
|
||||
"webrick"
|
||||
end
|
||||
end
|
||||
|
||||
if server == "webrick"
|
||||
puts "=> Booting WEBrick..."
|
||||
else
|
||||
puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
|
||||
case server
|
||||
when "webrick"
|
||||
puts "=> Booting WEBrick..."
|
||||
when "lighttpd"
|
||||
puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)"
|
||||
when "mongrel"
|
||||
puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)"
|
||||
end
|
||||
|
||||
['sessions', 'cache', 'sockets'].each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) }
|
||||
|
46
railties/lib/commands/servers/mongrel.rb
Normal file
46
railties/lib/commands/servers/mongrel.rb
Normal file
@ -0,0 +1,46 @@
|
||||
require 'rbconfig'
|
||||
|
||||
unless RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `mongrel_rails` }.blank?
|
||||
puts "PROBLEM: Mongrel is not available on your system (or not in your path)"
|
||||
exit 1
|
||||
end
|
||||
|
||||
require 'optparse'
|
||||
|
||||
detach = false
|
||||
ip = nil
|
||||
port = nil
|
||||
|
||||
ARGV.options do |opt|
|
||||
opt.on("-p", "--port=port", Integer,
|
||||
"Runs Rails on the specified port.",
|
||||
"Default: 3000") { |p| port = p }
|
||||
opt.on("-b", "--binding=ip", String,
|
||||
"Binds Rails to the specified ip.",
|
||||
"Default: 0.0.0.0") { |i| ip = i }
|
||||
opt.on('-h', '--help', 'Show this message.') { puts opt; exit 0 }
|
||||
opt.on('-d', '-d', 'Call with -d to detach') { detach = true }
|
||||
opt.parse!
|
||||
end
|
||||
|
||||
default_port, default_ip = 3000, '0.0.0.0'
|
||||
puts "=> Rails application started on http://#{ip || default_ip}:#{port || default_port}"
|
||||
|
||||
if !detach
|
||||
puts "=> Call with -d to detach"
|
||||
puts "=> Ctrl-C to shutdown server"
|
||||
detach = false
|
||||
end
|
||||
|
||||
trap(:INT) { exit }
|
||||
|
||||
tail_thread = nil
|
||||
|
||||
begin
|
||||
`mongrel_rails start #{detach ? "-d " : ""} -p #{port || default_port} -a #{ip || default_ip}`
|
||||
ensure
|
||||
unless detach
|
||||
tail_thread.kill if tail_thread
|
||||
puts 'Exiting'
|
||||
end
|
||||
end
|
Loading…
Reference in New Issue
Block a user