diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-29 19:43:39 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-12-29 19:43:39 +0000 |
| commit | 07de7612bd11f152df4bb9e68f63de61ec0e6c3d (patch) | |
| tree | ddb2849beb54cccd00d3291e52afb9aeb9b35a60 /railties | |
| parent | 20d29b379767713c64397a28105d1b74f0f36f5f (diff) | |
| download | rails-07de7612bd11f152df4bb9e68f63de61ec0e6c3d.tar.gz rails-07de7612bd11f152df4bb9e68f63de61ec0e6c3d.tar.bz2 rails-07de7612bd11f152df4bb9e68f63de61ec0e6c3d.zip | |
Don't make new_mongrel server default yet
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8511 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/commands/server.rb | 8 |
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 |