diff options
Diffstat (limited to 'railties/lib/commands/server.rb')
-rw-r--r-- | railties/lib/commands/server.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index f84db9c049..5414ab3e6a 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -18,7 +18,11 @@ server = case ARGV.first ARGV.shift else if defined?(Mongrel) - "mongrel" + if Mongrel.respond_to?(:log) + "new_mongrel" + else + "mongrel" + end elsif RUBY_PLATFORM !~ /(:?mswin|mingw)/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI) "lighttpd" else @@ -31,7 +35,7 @@ case server puts "=> Booting WEBrick..." when "lighttpd" puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)" - when "mongrel" + when "mongrel", "new_mongrel" puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)" end |