aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-19 11:42:27 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-19 11:42:27 -0500
commite0d7bace4ecb9152fac112e809af521e36fbc6a5 (patch)
treea4d36123c897ccbf6dc8206a3026b6c50da21905
parent576cae004342899b0506a7834edc524a02a7d9ef (diff)
downloadrails-e0d7bace4ecb9152fac112e809af521e36fbc6a5.tar.gz
rails-e0d7bace4ecb9152fac112e809af521e36fbc6a5.tar.bz2
rails-e0d7bace4ecb9152fac112e809af521e36fbc6a5.zip
Prefer Mongrel over Thin [#658 state:resolved]
-rw-r--r--railties/lib/commands/server.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb
index 7306c248fb..15f417b5be 100644
--- a/railties/lib/commands/server.rb
+++ b/railties/lib/commands/server.rb
@@ -23,10 +23,10 @@ server = case ARGV.first
when "lighttpd", "mongrel", "new_mongrel", "webrick", "thin"
ARGV.shift
else
- if defined?(Thin)
- "thin"
- elsif defined?(Mongrel)
+ if defined?(Mongrel)
"mongrel"
+ elsif defined?(Thin)
+ "thin"
elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI)
"lighttpd"
else