From 07de7612bd11f152df4bb9e68f63de61ec0e6c3d Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Sat, 29 Dec 2007 19:43:39 +0000
Subject: Don't make new_mongrel server default yet
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8511 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
railties/lib/commands/server.rb | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index 5414ab3e6a..40ffdd1167 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -14,15 +14,11 @@ rescue Exception
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
--
cgit v1.2.3