Backport Eric's changes to the http parser from trunk (Eric Wong).

Apply fix for Ragel 6 (Eric Wong, Ry Dahl).

Two tests fail with the new parser (1 failed with the old parser). Needs investigation.

Close #12 (mongrel_rails send_signal leaves a filehandle open until gc).
Close #14 (mongrel_rails command line option --num-procs does not change the max number of procs).
Close #15 (mongrel squashes helpful exception in register method).
Close #16, XXX needs audit! (CGIWrapper "options" attr_reader has no corresponding @options variable).
Close #20 (Mongrel doesn't erase temporary files during it's operation on windows).
Close #19, XXX needs audit! (HttpResponse#reset does not properly reset HeaderOut).
Close #22 (gem_plugin should load gems from Gem.path not Gem.dir).
Close #23 (mongrel_cluster's mongrel_rails configuration option isn't fully respected).

If I had git, being offline wouldn't have resulted in one massive commit.



git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/branches/stable_1-2@995 19e92222-5c0b-0410-8929-a290d50e31e9

2 files changed, 6 insertions, 3 deletions

diff --git a/projects/mongrel_cluster/lib/mongrel_cluster/init.rb b/projects/mongrel_cluster/lib/mongrel_cluster/init.rb
index 1c3a613..0f18fe9 100644
--- a/projects/mongrel_cluster/lib/mongrel_cluster/init.rb
+++ b/projects/mongrel_cluster/lib/mongrel_cluster/init.rb
@@ -59,7 +59,7 @@ module Cluster
     def start
       read_options
       
-      argv = [ "mongrel_rails" ]
+      argv = @options['mongrel_rails']
       argv << "start"
       argv << "-d"
       argv << "-e #{@options['environment']}" if @options['environment']
@@ -103,7 +103,7 @@ module Cluster
     def stop
       read_options
     
-      argv = [ "mongrel_rails" ]
+      argv = @options['mongrel_rails']
       argv << "stop"
       argv << "-c #{@options["cwd"]}" if @options["cwd"]
       argv << "-f" if @force
@@ -300,6 +300,7 @@ module Cluster
         ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
         ['', '--user USER', "User to run as", :@user, nil],
         ['', '--group GROUP', "Group to run as", :@group, nil],
+        ['', '--mongrel_rails PATH', "Full path to mongrel_rails script", :@mongrel_rails, "mongrel_rails"],
         ['', '--prefix PREFIX', "Rails prefix to use", :@prefix, nil]
       ]
     end
@@ -334,6 +335,7 @@ module Cluster
       @options["user"] = @user if @user
       @options["group"] = @group if @group
       @options["prefix"] = @prefix if @prefix
+      @options["mongrel_rails"] = @mongrel_rails if @mongrel_rails 
       
       log "Writing configuration file to #{@config_file}."
       File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}
diff --git a/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb b/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb
index a82c424..312ef5c 100644
--- a/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb
+++ b/projects/mongrel_cluster/lib/mongrel_cluster/recipes_2.rb
@@ -7,7 +7,7 @@ Capistrano::Configuration.instance.load do
   set :mongrel_user, nil
   set :mongrel_group, nil
   set :mongrel_prefix, nil
-  set :mongrel_rails, 'mongrel_rails'
+  set :mongrel_rails, "mongrel_rails"
   set :mongrel_clean, false
   set :mongrel_pid_file, nil
   set :mongrel_log_file, nil
@@ -37,6 +37,7 @@ Capistrano::Configuration.instance.load do
         argv << "--group #{mongrel_group}" if mongrel_group
         argv << "--prefix #{mongrel_prefix}" if mongrel_prefix
         argv << "-S #{mongrel_config_script}" if mongrel_config_script
+        argv << "--mongrel_rails #{mongrel_rails}" if mongrel_rails         
         cmd = argv.join " "
         send(run_method, cmd)
       end