aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/commands/server.rb8
1 files 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