Permalink
Browse files

Don't make new_mongrel server default yet

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8511 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 20d29b3 commit 07de7612bd11f152df4bb9e68f63de61ec0e6c3d @jeremy jeremy committed Dec 29, 2007
Showing with 2 additions and 6 deletions.
  1. +2 −6 railties/lib/commands/server.rb
View
8 railties/lib/commands/server.rb
@@ -14,15 +14,11 @@
end
server = case ARGV.first
- when "lighttpd", "mongrel", "webrick"
+ when "lighttpd", "mongrel", "new_mongrel", "webrick"
ARGV.shift
else
if defined?(Mongrel)
- if Mongrel.respond_to?(:log)
- "new_mongrel"
- else
- "mongrel"
- end
+ "mongrel"
elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
"lighttpd"
else

0 comments on commit 07de761

Please sign in to comment.