diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-11-22 14:00:58 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-11-22 14:00:58 -0600 |
| commit | 0ecf2f6bdb7423516a18f45a65e1301cf8cd9c7d (patch) | |
| tree | f62b6225b7389dd697b42246a708e6186c0ff90a /railties/lib/commands | |
| parent | 2144c0f8ff9bdd3dceb085ddb1c4b8711ef329a4 (diff) | |
| download | rails-0ecf2f6bdb7423516a18f45a65e1301cf8cd9c7d.tar.gz rails-0ecf2f6bdb7423516a18f45a65e1301cf8cd9c7d.tar.bz2 rails-0ecf2f6bdb7423516a18f45a65e1301cf8cd9c7d.zip | |
Kill dead "new_mongrel" handler
Diffstat (limited to 'railties/lib/commands')
| -rw-r--r-- | railties/lib/commands/server.rb | 4 | ||||
| -rw-r--r-- | railties/lib/commands/servers/new_mongrel.rb | 16 |
2 files changed, 2 insertions, 18 deletions
diff --git a/railties/lib/commands/server.rb b/railties/lib/commands/server.rb index 15f417b5be..54628d8bb1 100644 --- a/railties/lib/commands/server.rb +++ b/railties/lib/commands/server.rb @@ -20,7 +20,7 @@ rescue Exception end server = case ARGV.first - when "lighttpd", "mongrel", "new_mongrel", "webrick", "thin" + when "lighttpd", "mongrel", "webrick", "thin" ARGV.shift else if defined?(Mongrel) @@ -39,7 +39,7 @@ case server puts "=> Booting WEBrick..." when "lighttpd" puts "=> Booting lighttpd (use 'script/server webrick' to force WEBrick)" - when "mongrel", "new_mongrel" + when "mongrel" puts "=> Booting Mongrel (use 'script/server webrick' to force WEBrick)" when "thin" puts "=> Booting Thin (use 'script/server webrick' to force WEBrick)" diff --git a/railties/lib/commands/servers/new_mongrel.rb b/railties/lib/commands/servers/new_mongrel.rb deleted file mode 100644 index 174dbf8a37..0000000000 --- a/railties/lib/commands/servers/new_mongrel.rb +++ /dev/null @@ -1,16 +0,0 @@ -unless defined?(Mongrel) - abort "PROBLEM: Mongrel is not available on your system (or not in your path)" -end - -require 'rails/mongrel_server/commands' - -GemPlugin::Manager.instance.load "rails::mongrel" => GemPlugin::INCLUDE, "rails" => GemPlugin::EXCLUDE - -case ARGV[0] ||= 'start' -when 'start', 'stop', 'restart' - ARGV[0] = "rails::mongrelserver::#{ARGV[0]}" -end - -if not Mongrel::Command::Registry.instance.run ARGV - exit 1 -end |