Rails 2.1 RC1

Updated Instiki to Rails 2.1 RC1 (aka 2.0.991).

vendor/rails/railties/lib/commands/servers/mongrel.rb

@@ -34,10 +34,10 @@ end
 
 puts "=> Rails application starting on http://#{OPTIONS[:ip]}:#{OPTIONS[:port]}"
 
-parameters = [ 
-  "start", 
-  "-p", OPTIONS[:port].to_s, 
-  "-a", OPTIONS[:ip].to_s, 
+parameters = [
+  "start",
+  "-p", OPTIONS[:port].to_s,
+  "-a", OPTIONS[:ip].to_s,
   "-e", OPTIONS[:environment],
   "-P", "#{RAILS_ROOT}/tmp/pids/mongrel.pid"
 ]
@@ -50,12 +50,12 @@ else
 
   start_debugger if OPTIONS[:debugger]
 
-  require 'initializer'
-  Rails::Initializer.run(:initialize_logger)
-
   puts "=> Call with -d to detach"
   puts "=> Ctrl-C to shutdown server"
-  tail_thread = tail(Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath)
+
+  log = Pathname.new("#{File.expand_path(RAILS_ROOT)}/log/#{RAILS_ENV}.log").cleanpath
+  open(log, (File::WRONLY | File::APPEND | File::CREAT)) unless File.exist? log
+  tail_thread = tail(log)
 
   trap(:INT) { exit }
 

vendor/rails/railties/lib/commands/servers/new_mongrel.rb

@@ -0,0 +1,16 @@
+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