mongrel_cluster 0.2.1 → 1.0.2

data/Rakefile

@@ -15,15 +15,15 @@ setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="0.2.1"
+version="1.0.2"
 name="mongrel_cluster"
 
 setup_gem(name, version) do |spec|
   spec.summary = "Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes."
   spec.description = spec.summary
   spec.author="Bradley Taylor"
-  spec.add_dependency('gem_plugin', '>= 0.2.1')
-  spec.add_dependency('mongrel', '>= 0.3.13.4')
+  spec.add_dependency('gem_plugin', '>= 0.2.2')
+  spec.add_dependency('mongrel', '>= 1.0.1')
   spec.files += Dir.glob("resources/**/*")
   spec.has_rdoc = false
   spec.files += Dir.glob("bin/*")
@@ -49,6 +49,6 @@ task :gem_source do
   rm_rf "pkg/#{name}-#{version}"
 
   sh %{ generate_yaml_index.rb -d pkg }
-  sh %{ scp -r pkg/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/railsmachine/releases/ }
+  sh %{ scp -r pkg/* #{ENV['SSH_USER']}@rubyforge.org:/var/www/gforge-projects/mongrel/releases/ }
 end
 

data/bin/mongrel_cluster_ctl

@@ -8,11 +8,11 @@ def run(command, verbose)
     confs =  Dir.glob("*.yml")
     confs += Dir.glob("*.conf")
     confs.each do |conf|
-      cmd = "mongrel_rails cluster::#{command} -c #{conf}"
+      cmd = "mongrel_rails cluster::#{command} -C #{conf}"
       cmd += " -v" if verbose
-      puts cmd if verbose
+      puts cmd if verbose || command == "status"
       output = `#{cmd}`
-      puts output if verbose
+      puts output if verbose || command == "status"
       puts "mongrel_rails cluster::#{command} returned an error." unless $?.success?     
     end
   end  
@@ -23,7 +23,7 @@ end
 @options[:verbose] = false
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} (start|stop|restart) [options]"
+  opts.banner = "Usage: #{$0} (start|stop|restart|status) [options]"
  
   opts.on("-c", "--conf_path PATH", "Path to mongrel_cluster configuration files") { |value| @options[:conf_path] = value }
   opts.on('-v', '--verbose', "Print all called commands and output.") { |value| @options[:verbose] = value }
@@ -57,8 +57,11 @@ when "restart":
   puts "Restarting all mongrel_clusters..."
   run "stop", @options[:verbose]
   run "start", @options[:verbose]
+when "status":
+  puts "Checking all mongrel_clusters..."
+  run "status", @options[:verbose]
 else
  puts "Unknown command."
 end
 
-exit
+exit

data/lib/mongrel_cluster/init.rb

@@ -3,91 +3,228 @@ require 'mongrel'
 require 'yaml'
 
 module Cluster
-  
   module ExecBase
-     include Mongrel::Command::Base
-     
-      def validate
-        valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
-        return @valid
-      end
+    include Mongrel::Command::Base
       
-      def read_options
-        @options = { 
-          "environment" => ENV['RAILS_ENV'] || "development",
-          "port" => 3000,
-          "pid_file" => "log/mongrel.pid",
-          "servers" => 2 
-        }
-        conf = YAML.load_file(@config_file)
-        @options.merge! conf if conf
-      end
+    STATUS_OK = 0
+    STATUS_ERROR = 2
+    
+    def validate
+      valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
+      return @valid
+    end
       
-      def start
-        read_options
-        port = @options["port"].to_i - 1
-        pid = @options["pid_file"].split(".")
-        puts "Starting #{@options["servers"]} Mongrel servers..."
-        1.upto(@options["servers"].to_i) do |i|
-          argv = [ "mongrel_rails" ]
-          argv << "start"
-          argv << "-d"
-          argv << "-e #{@options["environment"]}" if @options["environment"]
-          argv << "-p #{port+i}"
-          argv << "-a #{@options["address"]}"  if @options["address"]
-          argv << "-l #{@options["log_file"]}" if @options["log_file"]
-          argv << "-P #{pid[0]}.#{port+i}.#{pid[1]}"
-          argv << "-c #{@options["cwd"]}" if @options["cwd"]
-          argv << "-t #{@options["timeout"]}" if @options["timeout"]
-          argv << "-m #{@options["mime_map"]}" if @options["mime_map"]
-          argv << "-r #{@options["docroot"]}" if @options["docroot"]
-          argv << "-n #{@options["num_procs"]}" if @options["num_procs"]
-          argv << "-B" if @options["debug"]
-          argv << "-S #{@options["config_script"]}" if @options["config_script"]
-          argv << "--user #{@options["user"]}" if @options["user"]
-          argv << "--group #{@options["group"]}" if @options["group"]
-          argv << "--prefix #{@options["prefix"]}" if @options["prefix"]
-          cmd = argv.join " "
-
-          puts cmd if @verbose
-          output = `#{cmd}`
-          unless $?.success?
-            puts cmd unless @verbose
-            puts output
-          end
+    def read_options
+      @options = { 
+        "environment" => ENV['RAILS_ENV'] || "development",
+        "port" => 3000,
+        "pid_file" => "tmp/pids/mongrel.pid",
+        "log_file" => "log/mongrel.log",
+        "servers" => 2
+      }
+      conf = YAML.load_file(@config_file)
+      @options.merge! conf if conf
+        
+      process_pid_file @options["pid_file"]
+      process_log_file @options["log_file"]
+
+      start_port = end_port = @only
+      start_port ||=  @options["port"].to_i
+      end_port ||=  start_port + @options["servers"] - 1
+      @ports = (start_port..end_port).to_a
+    end
+
+    def process_pid_file(pid_file)
+      @pid_file_ext = File.extname(pid_file)
+      @pid_file_base = File.basename(pid_file, @pid_file_ext)
+      @pid_file_dir = File.dirname(pid_file)
+    end
+
+    def process_log_file(log_file)
+      @log_file_ext = File.extname(log_file)
+      @log_file_base = File.basename(log_file, @log_file_ext)
+      @log_file_dir = File.dirname(log_file)
+    end
+    
+    def port_pid_file(port)
+      pid_file = [@pid_file_base, port].join(".") + @pid_file_ext      
+      File.join(@pid_file_dir, pid_file)
+    end
+      
+    def port_log_file(port)
+      log_file = [@log_file_base, port].join(".") +  @log_file_ext      
+      File.join(@log_file_dir, log_file)
+    end
+      
+    def start
+      read_options
+      
+      argv = [ "mongrel_rails" ]
+      argv << "start"
+      argv << "-d"
+      argv << "-e #{@options["environment"]}" if @options["environment"]
+      argv << "-a #{@options["address"]}"  if @options["address"]
+      argv << "-c #{@options["cwd"]}" if @options["cwd"]
+      argv << "-t #{@options["timeout"]}" if @options["timeout"]
+      argv << "-m #{@options["mime_map"]}" if @options["mime_map"]
+      argv << "-r #{@options["docroot"]}" if @options["docroot"]
+      argv << "-n #{@options["num_procs"]}" if @options["num_procs"]
+      argv << "-B" if @options["debug"]
+      argv << "-S #{@options["config_script"]}" if @options["config_script"]
+      argv << "--user #{@options["user"]}" if @options["user"]
+      argv << "--group #{@options["group"]}" if @options["group"]
+      argv << "--prefix #{@options["prefix"]}" if @options["prefix"]
+      cmd = argv.join " "
+      
+      @ports.each do |port|              
+        if @clean && pid_file_exists?(port) && !check_process(port)
+          pid_file = port_pid_file(port)        
+          log "missing process: removing #{pid_file}"
+          File.unlink(pid_file) 
         end
+        
+        if pid_file_exists?(port) && check_process(port)
+          log "already started port #{port}"         
+          next
+        end
+
+        exec_cmd = cmd + " -p #{port} -P #{port_pid_file(port)}"
+        exec_cmd += " -l #{port_log_file(port)}"
+        log "starting port #{port}"          
+        log_verbose exec_cmd
+        output = `#{exec_cmd}`
+        log_error output unless $?.success?
       end
+    end
       
-      def stop
-        read_options
-        port = @options["port"].to_i - 1
-        pid = @options["pid_file"].split(".")
-        puts "Stopping #{@options["servers"]} Mongrel servers..."
-        1.upto(@options["servers"].to_i) do |i|
-          argv = [ "mongrel_rails" ]
-          argv << "stop"
-          argv << "-P #{pid[0]}.#{port+i}.#{pid[1]}"
-          argv << "-c #{@options["cwd"]}" if @options["cwd"]
-          argv << "-f" if @force
-          cmd = argv.join " "
-          puts cmd if @verbose
-          output = `#{cmd}`
-          unless $?.success?
-            puts cmd unless @verbose
-            puts output
-          end
+    def stop
+      read_options
+    
+      argv = [ "mongrel_rails" ]
+      argv << "stop"
+      argv << "-c #{@options["cwd"]}" if @options["cwd"]
+      argv << "-f" if @force
+      cmd = argv.join " "
+
+      @ports.each do |port|
+        pid = check_process(port)        
+        if @clean && pid && !pid_file_exists?(port)       
+          log "missing pid_file: killing mongrel_rails port #{port}, pid #{pid}"
+          Process.kill("KILL", pid.to_i)  
+        end
+        
+        if !check_process(port)
+          log "already stopped port #{port}"                   
+          next       
         end
+
+        exec_cmd = cmd + " -P #{port_pid_file(port)}"
+        log "stopping port #{port}"          
+        log_verbose exec_cmd
+        output = `#{exec_cmd}`
+        log_error output unless $?.success?
+        
       end
+    end
+  
+    def status
+      read_options
       
+      status = STATUS_OK
+     
+      @ports.each do |port|
+        pid = check_process(port)        
+        unless pid_file_exists?(port)        
+          log "missing pid_file: #{port_pid_file(port)}"  
+          status = STATUS_ERROR
+        else
+          log "found pid_file: #{port_pid_file(port)}"
+        end    
+        if pid
+          log "found mongrel_rails: port #{port}, pid #{pid}"
+        else
+          log "missing mongrel_rails: port #{port}"
+          status = STATUS_ERROR
+        end
+        puts ""
+      end
+
+      return status
+    end
+
+    def pid_file_exists?(port)    
+      pid_file = port_pid_file(port)
+      exists = false
+      chdir_cwd do     
+        exists = File.exists?(pid_file)  
+      end
+      exists
+    end
+
+    def check_process(port)
+      if pid_file_exists?(port)
+        pid = read_pid(port)
+        ps_output = `ps -o #{cmd_name}= -p #{pid}`
+        pid = ps_output =~ /mongrel_rails/ ? pid : nil
+      else
+        pid = find_pid(port)
+      end
+      return pid
+    end 
+    
+    def cmd_name 
+      RUBY_PLATFORM =~ /solaris/i ? "args" : "command"
+    end
+
+    def chdir_cwd
+      pwd = Dir.pwd
+      Dir.chdir(@options["cwd"]) if @options["cwd"]     
+      yield
+      Dir.chdir(pwd) if @options["cwd"]
+    end
+
+    def read_pid(port)
+      pid_file = port_pid_file(port)
+      pid = 0
+      chdir_cwd do     
+        pid = File.read(pid_file)
+      end
+      return pid
+    end
+ 
+    def find_pid(port)
+      ps_cmd = "ps -ewwo pid,#{cmd_name}"
+      ps_output = `#{ps_cmd}`      
+      ps_output.each do |line|     
+        if line =~ /-P #{Regexp.escape(port_pid_file(port))} /              
+          pid = line.split[0]
+          return pid
+        end
+      end
+      return nil
+    end
+
+    def log_error(message)
+      log(message)
+    end
+
+    def log_verbose(message)
+      log(message) if @verbose
+    end
+
+    def log(message)
+      puts message
+    end   
   end
-  
   class Start < GemPlugin::Plugin "/commands"
     include ExecBase
     
     def configure
       options [ 
         ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
-        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+        ['', '--clean', "Remove pid_file if needed before starting", :@clean, false],
+        ['', '--only PORT', "Port number of cluster member", :@only, nil]
       ]
     end
 
@@ -103,7 +240,9 @@ module Cluster
       options [
        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
        ['-f', '--force', "Force the shutdown.", :@force, false],
-       ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]
+       ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+       ['', '--clean', "Remove orphaned process if needed before stopping", :@clean, false],
+       ['', '--only PORT', "Port number of cluster member", :@only, nil]
       ]
     end
     
@@ -119,7 +258,9 @@ module Cluster
       options [ 
         ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
         ['-f', '--force', "Force the shutdown.", :@force, false],
-        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]       
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+        ['', '--clean', "Call stop and start with --clean", :@clean, false],        
+        ['', '--only PORT', "Port number of cluster member", :@only, nil]       
       ]
     end
     
@@ -131,15 +272,15 @@ module Cluster
   end
   
   class Configure < GemPlugin::Plugin "/commands"
-    include Mongrel::Command::Base
+    include ExecBase
     
     def configure 
       options [
         ["-e", "--environment ENV", "Rails environment to run as", :@environment, nil],
         ['-p', '--port PORT', "Starting port to bind to", :@port, 3000],
         ['-a', '--address ADDR', "Address to bind to", :@address, nil],
-        ['-l', '--log FILE', "Where to write log messages", :@log_file, nil],
-        ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "log/mongrel.pid"],
+        ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
+        ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/mongrel.pid"],
         ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
         ['-t', '--timeout SECONDS', "Timeout all requests after SECONDS time", :@timeout, nil],
         ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
@@ -185,9 +326,26 @@ module Cluster
       @options["group"] = @group if @group
       @options["prefix"] = @prefix if @prefix
       
-      puts "Writing configuration file to #{@config_file}."
+      log "Writing configuration file to #{@config_file}."
       File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}
     end  
   end
+
+  class Status < GemPlugin::Plugin "/commands"
+    include ExecBase
+
+    def configure 
+      options [ 
+        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+        ['', '--only PORT', "Port number of cluster member", :@only, nil]       
+      ]
+    end
+    
+    def run
+      status
+    end
+
+  end
 end
 

data/lib/mongrel_cluster/init.rb~

@@ -0,0 +1,351 @@
+require 'gem_plugin'
+require 'mongrel'
+require 'yaml'
+
+module Cluster
+  module ExecBase
+    include Mongrel::Command::Base
+      
+    STATUS_OK = 0
+    STATUS_ERROR = 2
+    
+    def validate
+      valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
+      return @valid
+    end
+      
+    def read_options
+      @options = { 
+        "environment" => ENV['RAILS_ENV'] || "development",
+        "port" => 3000,
+        "pid_file" => "tmp/pids/mongrel.pid",
+        "log_file" => "log/mongrel.log",
+        "servers" => 2
+      }
+      conf = YAML.load_file(@config_file)
+      @options.merge! conf if conf
+        
+      process_pid_file @options["pid_file"]
+      process_log_file @options["log_file"]
+
+      start_port = end_port = @only
+      start_port ||=  @options["port"].to_i
+      end_port ||=  start_port + @options["servers"] - 1
+      @ports = (start_port..end_port).to_a
+    end
+
+    def process_pid_file(pid_file)
+      @pid_file_ext = File.extname(pid_file)
+      @pid_file_base = File.basename(pid_file, @pid_file_ext)
+      @pid_file_dir = File.dirname(pid_file)
+    end
+
+    def process_log_file(log_file)
+      @log_file_ext = File.extname(log_file)
+      @log_file_base = File.basename(log_file, @log_file_ext)
+      @log_file_dir = File.dirname(log_file)
+    end
+    
+    def port_pid_file(port)
+      pid_file = [@pid_file_base, port].join(".") + @pid_file_ext      
+      File.join(@pid_file_dir, pid_file)
+    end
+      
+    def port_log_file(port)
+      log_file = [@log_file_base, port].join(".") +  @log_file_ext      
+      File.join(@log_file_dir, log_file)
+    end
+      
+    def start
+      read_options
+      
+      argv = [ "mongrel_rails" ]
+      argv << "start"
+      argv << "-d"
+      argv << "-e #{@options["environment"]}" if @options["environment"]
+      argv << "-a #{@options["address"]}"  if @options["address"]
+      argv << "-c #{@options["cwd"]}" if @options["cwd"]
+      argv << "-t #{@options["timeout"]}" if @options["timeout"]
+      argv << "-m #{@options["mime_map"]}" if @options["mime_map"]
+      argv << "-r #{@options["docroot"]}" if @options["docroot"]
+      argv << "-n #{@options["num_procs"]}" if @options["num_procs"]
+      argv << "-B" if @options["debug"]
+      argv << "-S #{@options["config_script"]}" if @options["config_script"]
+      argv << "--user #{@options["user"]}" if @options["user"]
+      argv << "--group #{@options["group"]}" if @options["group"]
+      argv << "--prefix #{@options["prefix"]}" if @options["prefix"]
+      cmd = argv.join " "
+      
+      @ports.each do |port|              
+        if @clean && pid_file_exists?(port) && !check_process(port)
+          pid_file = port_pid_file(port)        
+          log "missing process: removing #{pid_file}"
+          File.unlink(pid_file) 
+        end
+        
+        if pid_file_exists?(port) && check_process(port)
+          log "already started port #{port}"         
+          next
+        end
+
+        exec_cmd = cmd + " -p #{port} -P #{port_pid_file(port)}"
+        exec_cmd += " -l #{port_log_file(port)}"
+        log "starting port #{port}"          
+        log_verbose exec_cmd
+        output = `#{exec_cmd}`
+        log_error output unless $?.success?
+      end
+    end
+      
+    def stop
+      read_options
+    
+      argv = [ "mongrel_rails" ]
+      argv << "stop"
+      argv << "-c #{@options["cwd"]}" if @options["cwd"]
+      argv << "-f" if @force
+      cmd = argv.join " "
+
+      @ports.each do |port|
+        pid = check_process(port)        
+        if @clean && pid && !pid_file_exists?(port)       
+          log "missing pid_file: killing mongrel_rails port #{port}, pid #{pid}"
+          Process.kill("KILL", pid.to_i)  
+        end
+        
+        if !check_process(port)
+          log "already stopped port #{port}"                   
+          next       
+        end
+
+        exec_cmd = cmd + " -P #{port_pid_file(port)}"
+        log "stopping port #{port}"          
+        log_verbose exec_cmd
+        output = `#{exec_cmd}`
+        log_error output unless $?.success?
+        
+      end
+    end
+  
+    def status
+      read_options
+      
+      status = STATUS_OK
+     
+      @ports.each do |port|
+        pid = check_process(port)        
+        unless pid_file_exists?(port)        
+          log "missing pid_file: #{port_pid_file(port)}"  
+          status = STATUS_ERROR
+        else
+          log "found pid_file: #{port_pid_file(port)}"
+        end    
+        if pid
+          log "found mongrel_rails: port #{port}, pid #{pid}"
+        else
+          log "missing mongrel_rails: port #{port}"
+          status = STATUS_ERROR
+        end
+        puts ""
+      end
+
+      return status
+    end
+
+    def pid_file_exists?(port)    
+      pid_file = port_pid_file(port)
+      exists = false
+      chdir_cwd do     
+        exists = File.exists?(pid_file)  
+      end
+      exists
+    end
+
+    def check_process(port)
+      if pid_file_exists?(port)
+        pid = read_pid(port)
+        ps_output = `ps -o #{cmd_name}= -p #{pid}`
+        pid = ps_output =~ /mongrel_rails/ ? pid : nil
+      else
+        pid = find_pid(port)
+      end
+      return pid
+    end 
+    
+    def cmd_name 
+      RUBY_PLATFORM =~ /solaris/i ? "args" : "command"
+    end
+
+    def chdir_cwd
+      pwd = Dir.pwd
+      Dir.chdir(@options["cwd"]) if @options["cwd"]     
+      yield
+      Dir.chdir(pwd) if @options["cwd"]
+    end
+
+    def read_pid(port)
+      pid_file = port_pid_file(port)
+      pid = 0
+      chdir_cwd do     
+        pid = File.read(pid_file)
+      end
+      return pid
+    end
+ 
+    def find_pid(port)
+      ps_cmd = "ps -ewwo pid,#{cmd_name}"
+      ps_output = `#{ps_cmd}`      
+      ps_output.each do |line|     
+        if line =~ /-P #{Regexp.escape(port_pid_file(port))} /              
+          pid = line.split[0]
+          return pid
+        end
+      end
+      return nil
+    end
+
+    def log_error(message)
+      log(message)
+    end
+
+    def log_verbose(message)
+      log(message) if @verbose
+    end
+
+    def log(message)
+      puts message
+    end   
+  end
+  class Start < GemPlugin::Plugin "/commands"
+    include ExecBase
+    
+    def configure
+      options [ 
+        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+        ['', '--clean', "Remove pid_file if needed before starting", :@clean, false],
+        ['', '--only PORT', "Port number of cluster member", :@only, nil]
+      ]
+    end
+
+    def run
+      start      
+    end
+  end
+  
+  class Stop < GemPlugin::Plugin "/commands"
+    include ExecBase
+
+    def configure
+      options [
+       ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
+       ['-f', '--force', "Force the shutdown.", :@force, false],
+       ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+       ['', '--clean', "Remove orphaned process if needed before stopping", :@clean, false],
+       ['', '--only PORT', "Port number of cluster member", :@only, nil]
+      ]
+    end
+    
+    def run
+      stop
+    end  
+  end
+  
+  class Restart < GemPlugin::Plugin "/commands"
+    include ExecBase
+
+    def configure 
+      options [ 
+        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-f', '--force', "Force the shutdown.", :@force, false],
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+        ['', '--clean', "Call stop and start with --clean", :@clean, false],        
+        ['', '--only PORT', "Port number of cluster member", :@only, nil]       
+      ]
+    end
+    
+    def run
+      stop
+      start
+    end
+    
+  end
+  
+  class Configure < GemPlugin::Plugin "/commands"
+    include ExecBase
+    
+    def configure 
+      options [
+        ["-e", "--environment ENV", "Rails environment to run as", :@environment, nil],
+        ['-p', '--port PORT', "Starting port to bind to", :@port, 3000],
+        ['-a', '--address ADDR', "Address to bind to", :@address, nil],
+        ['-l', '--log FILE', "Where to write log messages", :@log_file, "log/mongrel.log"],
+        ['-P', '--pid FILE', "Where to write the PID", :@pid_file, "tmp/pids/mongrel.pid"],
+        ['-c', '--chdir PATH', "Change to dir before starting (will be expanded)", :@cwd, nil],
+        ['-t', '--timeout SECONDS', "Timeout all requests after SECONDS time", :@timeout, nil],
+        ['-m', '--mime PATH', "A YAML file that lists additional MIME types", :@mime_map, nil],
+        ['-r', '--root PATH', "Set the document root (default 'public')", :@docroot, nil],
+        ['-n', '--num-procs INT', "Number of processor threads to use", :@num_procs, nil],
+        ['-B', '--debug', "Enable debugging mode", :@debug, nil],
+        ['-S', '--script PATH', "Load the given file as an extra config script.", :@config_script, nil],
+        ['-N', '--num-servers INT', "Number of Mongrel servers", :@servers, 2],
+        ['-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],
+        ['', '--prefix PREFIX', "Rails prefix to use", :@prefix, nil]
+      ]
+    end
+
+    def validate
+      @servers = @servers.to_i
+      
+      valid?(@servers > 0, "Must give a valid number of servers")
+      valid_dir? File.dirname(@config_file), "Path to config file not valid: #{@config_file}"
+      
+      return @valid
+    end
+
+    def run
+      @options = { 
+        "port" => @port,
+        "servers" => @servers,
+        "pid_file" => @pid_file
+      }
+      
+      @options["log_file"] = @log_file if @log_file
+      @options["debug"] = @debug if @debug
+      @options["num_procs"] = @num_procs if @num_procs
+      @options["docroot"] = @docroot if @docroots
+      @options["address"] = @address if @address
+      @options["timeout"] = @timeout if @timeout
+      @options["environment"] = @environment if @environment
+      @options["mime_map"] = @mime_map if @mime_map
+      @options["config_script"] = @config_script if @config_script
+      @options["cwd"] = @cwd if @cwd
+      @options["user"] = @user if @user
+      @options["group"] = @group if @group
+      @options["prefix"] = @prefix if @prefix
+      
+      log "Writing configuration file to #{@config_file}."
+      File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}
+    end  
+  end
+
+  class Status < GemPlugin::Plugin "/commands"
+    include ExecBase
+
+    def configure 
+      options [ 
+        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false],
+        ['', '--only PORT', "Port number of cluster member", :@only, nil]       
+      ]
+    end
+    
+    def run
+      status
+    end
+
+  end
+end
+

data/lib/mongrel_cluster/recipes.rb

@@ -7,7 +7,12 @@ Capistrano.configuration(:must_exist).load do
   set :mongrel_user, nil
   set :mongrel_group, nil
   set :mongrel_prefix, nil
-  
+  set :mongrel_rails, 'mongrel_rails'
+  set :mongrel_clean, false
+  set :mongrel_pid_file, nil
+  set :mongrel_log_file, nil
+  set :mongrel_config_script, nil
+ 
   desc <<-DESC
   Configure Mongrel processes on the app server. This uses the :use_sudo
   variable to determine whether to use sudo or not. By default, :use_sudo is
@@ -17,16 +22,19 @@ Capistrano.configuration(:must_exist).load do
     set_mongrel_conf
         
     argv = []
-    argv << "mongrel_rails cluster::configure"
+    argv << "#{mongrel_rails} cluster::configure"
     argv << "-N #{mongrel_servers.to_s}"
     argv << "-p #{mongrel_port.to_s}"
     argv << "-e #{mongrel_environment}"
     argv << "-a #{mongrel_address}"
     argv << "-c #{current_path}"
     argv << "-C #{mongrel_conf}"
+    argv << "-P #{mongrel_pid_file}" if mongrel_pid_file
+    argv << "-l #{mongrel_log_file}" if mongrel_log_file
     argv << "--user #{mongrel_user}" if mongrel_user
     argv << "--group #{mongrel_group}" if mongrel_group
     argv << "--prefix #{mongrel_prefix}" if mongrel_prefix
+    argv << "-S #{mongrel_config_script}" if mongrel_config_script
     cmd = argv.join " "
     send(run_method, cmd)
   end
@@ -37,7 +45,9 @@ Capistrano.configuration(:must_exist).load do
   DESC
   task :start_mongrel_cluster , :roles => :app do
     set_mongrel_conf
-    send(run_method, "mongrel_rails cluster::start -C #{mongrel_conf}")
+    cmd = "#{mongrel_rails} cluster::start -C #{mongrel_conf}"
+    cmd += " --clean" if mongrel_clean    
+    send(run_method, cmd)
   end
   
   desc <<-DESC
@@ -46,7 +56,9 @@ Capistrano.configuration(:must_exist).load do
   DESC
   task :restart_mongrel_cluster , :roles => :app do
     set_mongrel_conf
-    send(run_method, "mongrel_rails cluster::restart -C #{mongrel_conf}")
+    cmd = "#{mongrel_rails} cluster::restart -C #{mongrel_conf}"
+    cmd += " --clean" if mongrel_clean    
+    send(run_method, cmd)
   end
   
   desc <<-DESC
@@ -56,7 +68,19 @@ Capistrano.configuration(:must_exist).load do
   DESC
   task :stop_mongrel_cluster , :roles => :app do
     set_mongrel_conf
-    send(run_method, "mongrel_rails cluster::stop -C #{mongrel_conf}")
+    cmd = "#{mongrel_rails} cluster::stop -C #{mongrel_conf}"
+    cmd += " --clean" if mongrel_clean    
+    send(run_method, cmd)
+  end
+
+  desc <<-DESC
+  Check the status of the Mongrel processes on the app server.  This uses the :use_sudo
+  variable to determine whether to use sudo or not. By default, :use_sudo is
+  set to true.
+  DESC
+  task :status_mongrel_cluster , :roles => :app do
+    set_mongrel_conf
+    send(run_method, "#{mongrel_rails} cluster::status -C #{mongrel_conf}")
   end
   
   desc <<-DESC
@@ -77,4 +101,4 @@ Capistrano.configuration(:must_exist).load do
     set :mongrel_conf, "/etc/mongrel_cluster/#{application}.yml" unless mongrel_conf
   end
 
-end
+end

data/resources/mongrel_cluster

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2006 Bradley Taylor, bradley@railsmachine.com
+# Copyright (c) 2007 Bradley Taylor, bradley@railsmachine.com
 #
 # mongrel_cluster       Startup script for Mongrel clusters.
 #
@@ -10,8 +10,10 @@
 #              
 
 CONF_DIR=/etc/mongrel_cluster
-RETVAL=0
+PID_DIR=/var/run/mongrel_cluster
+USER=mongrel
 
+RETVAL=0
 
 # Gracefully exit if the controller is missing.
 which mongrel_cluster_ctl >/dev/null || exit 0
@@ -21,6 +23,10 @@ which mongrel_cluster_ctl >/dev/null || exit 0
 
 case "$1" in
     start)
+      # Create pid directory
+      mkdir -p $PID_DIR
+      chown $USER:$USER $PID_DIR
+
       mongrel_cluster_ctl start -c $CONF_DIR
       RETVAL=$?
   ;;
@@ -31,11 +37,15 @@ case "$1" in
     restart)
       mongrel_cluster_ctl restart -c $CONF_DIR
       RETVAL=$?
+  ;;
+    status)
+      mongrel_cluster_ctl status -c $CONF_DIR
+      RETVAL=$?
   ;;
     *)
-      echo "Usage: mongrel_cluster {start|stop|restart}"
+      echo "Usage: mongrel_cluster {start|stop|restart|status}"
       exit 1
   ;;
 esac      
 
-exit $RETVAL
+exit $RETVAL

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.2
 specification_version: 1
 name: mongrel_cluster
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2006-09-11 00:00:00 -07:00
+  version: 1.0.2
+date: 2007-07-10 00:00:00 -04:00
 summary: Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Bradley Taylor
 files: 
@@ -35,6 +36,7 @@ files:
 - bin/mongrel_cluster_ctl
 - lib/mongrel_cluster
 - lib/mongrel_cluster/recipes.rb
+- lib/mongrel_cluster/init.rb~
 - lib/mongrel_cluster/init.rb
 - tools/rakehelp.rb
 - resources/mongrel_cluster
@@ -59,7 +61,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.1
+        version: 0.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel
@@ -68,5 +70,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.13.4
+        version: 1.0.1
     version: