diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-23 22:32:10 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-06-23 22:32:10 +0000 |
commit | 8b89bd779a1ddc78da63de295574b8519c3e94c8 (patch) | |
tree | ed158214af6103059a3a5b8ff323edf36cc95c53 /railties/lib/commands/server.rb | |
parent | b533431ce5ec76ac531a4b303aea3afd35a4dde9 (diff) | |
download | rails-8b89bd779a1ddc78da63de295574b8519c3e94c8.tar.gz rails-8b89bd779a1ddc78da63de295574b8519c3e94c8.tar.bz2 rails-8b89bd779a1ddc78da63de295574b8519c3e94c8.zip |
Mongrel support for script/server. Closes #5475.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4486 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/commands/server.rb')
-rw-r--r-- | railties/lib/commands/server.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index 0857a5756a..1a8d3fd29d 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -8,22 +8,25 @@ rescue Exception end server = case ARGV.first - when "lighttpd" - ARGV.shift - when "webrick" + when "lighttpd", "mongrel", "webrick" ARGV.shift else if RUBY_PLATFORM !~ /mswin/ && !silence_stderr { `lighttpd -version` }.blank? && defined?(FCGI) "lighttpd" + elsif !silence_stderr { `mongrel_rails -v` }.blank? + "mongrel" else "webrick" end end -if server == "webrick" - puts "=> Booting WEBrick..." -else - puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)" +case server + when "webrick" + puts "=> Booting WEBrick..." + when "lighttpd" + puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)" + when "mongrel" + puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)" end ['sessions', 'cache', 'sockets'].each { |dir_to_make| FileUtils.mkdir_p(File.join(RAILS_ROOT, 'tmp', dir_to_make)) } |