mongrel_cluster 0.2.0 → 0.2.1

data/COPYING

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Bradley Taylor, bradley@railsmachine.com
+Copyright (c) 2006 Bradley Taylor, bradley@fluxura.com
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006 Bradley Taylor, bradley@railsmachine.com
+Copyright (c) 2006 Bradley Taylor, bradley@fluxura.com
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

data/README

@@ -14,7 +14,7 @@ mongrel_rails cluster::restart
 Stop cluster:
 mongrel_rails cluster::stop
 
-*Capistrano Recipe*
+Capistrano Recipe
 
 Add to config/deploy.rb:
 require 'mongrel_cluster/recipes'
@@ -39,7 +39,7 @@ restart_mongrel_cluster: Restart the Mongrel processes on the app server by star
 restart: Calls restart_mongrel_cluster to allow Mongrel to be used with the standard Capistrano deploy task.
 spinner: Calls start_mongrel_cluster to allow Mongrel to be used with the standard Capistrano cold_deploy task.
 
-* Supporting starting clusters on boot. *
+Supporting starting clusters on boot.
 1. Create mongrel_cluster conf directory (/etc/mongrel_cluster).
 2. Assign ownership to your capistrano user.
 3. Copy the init.d script from this gem's resouces directory /etc/init.d.

data/Rakefile

@@ -15,7 +15,7 @@ setup_rdoc ['README', 'LICENSE', 'COPYING', 'lib/**/*.rb', 'doc/**/*.rdoc']
 desc "Does a full compile, test run"
 task :default => [:test, :package]
 
-version="0.2.0"
+version="0.2.1"
 name="mongrel_cluster"
 
 setup_gem(name, version) do |spec|
@@ -23,7 +23,7 @@ setup_gem(name, version) do |spec|
   spec.description = spec.summary
   spec.author="Bradley Taylor"
   spec.add_dependency('gem_plugin', '>= 0.2.1')
-  spec.add_dependency('mongrel', '>= 0.3.13')
+  spec.add_dependency('mongrel', '>= 0.3.13.4')
   spec.files += Dir.glob("resources/**/*")
   spec.has_rdoc = false
   spec.files += Dir.glob("bin/*")

data/bin/mongrel_cluster_ctl

@@ -1,12 +1,14 @@
 #!/usr/bin/env ruby
-# Copyright (c) 2006 Bradley Taylor, bradley@railsmachine.com
+# Copyright (c) 2006 Bradley Taylor, bradley@fluxura.com
 
 require 'optparse'
 
 def run(command, verbose)
-  Dir.chdir @options[:conf_path] do 
-    Dir.glob("*.yml").each do |config|
-      cmd = "mongrel_rails cluster::#{command} -c #{config}"
+  Dir.chdir @options[:conf_path] do
+    confs =  Dir.glob("*.yml")
+    confs += Dir.glob("*.conf")
+    confs.each do |conf|
+      cmd = "mongrel_rails cluster::#{command} -c #{conf}"
       cmd += " -v" if verbose
       puts cmd if verbose
       output = `#{cmd}`

data/lib/mongrel_cluster/init.rb

@@ -4,152 +4,130 @@ 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
+      
+      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
+      
+      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
+        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
+        end
+      end
+      
+  end
+  
   class Start < GemPlugin::Plugin "/commands"
-    include Mongrel::Command::Base
+    include ExecBase
     
     def configure
       options [ 
-        ['-C', '--config PATH', "Path to configuration file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-C', '--config PATH', "Path to cluster configuration file", :@config_file, "config/mongrel_cluster.yml"],
         ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]
       ]
     end
 
-    def validate
-      valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
-      return @valid
-    end
-    
     def run
-      @options = { 
-        "port" => 3000,
-        "pid_file" => "log/mongrel.pid",
-        "servers" => 2 
-      }
-      
-      @conf_options = YAML.load_file(@config_file)
-      @options.merge! @conf_options if @conf_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"]
-        cmd = argv.join " "
-        
-        puts cmd if @verbose
-        output = `#{cmd}`
-        unless $?.success?
-          puts cmd unless @verbose
-          puts output
-        end
-      end
+      start      
     end
   end
   
   class Stop < GemPlugin::Plugin "/commands"
-    include Mongrel::Command::Base
+    include ExecBase
 
     def configure
       options [
-       ['-C', '--config PATH', "Path to config file", :@config_file, "config/mongrel_cluster.yml"],
+       ['-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]
       ]
     end
-
-    def validate
-      valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
-      return @valid
-    end
     
     def run
-      @options = { 
-       "environment" => ENV['RAILS_ENV'] || "development",
-       "port" => 3000,
-       "pid_file" => "log/mongrel.pid",
-       "servers" => 2 
-      }
-      
-      @conf_options = YAML.load_file(@config_file)
-      @options.merge! @conf_options if @conf_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
-      end
+      stop
     end  
   end
   
   class Restart < GemPlugin::Plugin "/commands"
-    include Mongrel::Command::Base
+    include ExecBase
 
     def configure 
       options [ 
-        ['-C', '--config PATH', "Path to config file", :@config_file, "config/mongrel_cluster.yml"],
-        ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
+        ['-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]       
       ]
     end
-
-    def validate
-      valid_exists?(@config_file, "Configuration file does not exist. Run mongrel_rails cluster::configure.")
-      return @valid
-    end
     
     def run
-      @options = { 
-        "port" => 3000,
-        "pid_file" => "log/mongrel.pid",
-        "servers" => 2 
-      }
-      
-      @conf_options = YAML.load_file(@config_file)
-      @options.merge! @conf_options if @conf_options
-      port = @options["port"].to_i - 1
-      pid = @options["pid_file"].split(".")
-      puts "Restarting #{@options["servers"]} Mongrel servers..."
-      1.upto(@options["servers"].to_i) do |i|
-        argv = [ "mongrel_rails" ]
-        argv << "restart"
-        argv << "-P #{pid[0]}.#{port+i}.#{pid[1]}"
-        argv << "-c #{@options["cwd"]}" if @options["cwd"]
-        argv << "-s" if @soft
-        cmd = argv.join " "
-        puts cmd if @verbose
-        output = `#{cmd}`
-        unless $?.success?
-          puts cmd unless @verbose
-          puts output
-        end
-      end
-    end  
+      stop
+      start
+    end
+    
   end
   
   class Configure < GemPlugin::Plugin "/commands"
@@ -170,9 +148,10 @@ module Cluster
         ['-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 config file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-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]
+        ['', '--group GROUP', "Group to run as", :@group, nil],
+        ['', '--prefix PREFIX', "Rails prefix to use", :@prefix, nil]
       ]
     end
 
@@ -204,6 +183,7 @@ module Cluster
       @options["cwd"] = @cwd if @cwd
       @options["user"] = @user if @user
       @options["group"] = @group if @group
+      @options["prefix"] = @prefix if @prefix
       
       puts "Writing configuration file to #{@config_file}."
       File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}

data/lib/mongrel_cluster/recipes.rb

@@ -6,6 +6,7 @@ Capistrano.configuration(:must_exist).load do
   set :mongrel_conf, nil
   set :mongrel_user, nil
   set :mongrel_group, nil
+  set :mongrel_prefix, nil
   
   desc <<-DESC
   Configure Mongrel processes on the app server. This uses the :use_sudo
@@ -25,6 +26,7 @@ Capistrano.configuration(:must_exist).load do
     argv << "-C #{mongrel_conf}"
     argv << "--user #{mongrel_user}" if mongrel_user
     argv << "--group #{mongrel_group}" if mongrel_group
+    argv << "--prefix #{mongrel_prefix}" if mongrel_prefix
     cmd = argv.join " "
     send(run_method, cmd)
   end
@@ -43,8 +45,8 @@ Capistrano.configuration(:must_exist).load do
   variable to determine whether to use sudo or not. By default, :use_sudo is set to true.
   DESC
   task :restart_mongrel_cluster , :roles => :app do
-    stop_mongrel_cluster
-    start_mongrel_cluster
+    set_mongrel_conf
+    send(run_method, "mongrel_rails cluster::restart -C #{mongrel_conf}")
   end
   
   desc <<-DESC
@@ -72,7 +74,7 @@ Capistrano.configuration(:must_exist).load do
   end
   
   def set_mongrel_conf
-    set :mongrel_conf, "/etc/mongrel_cluster/#{application}.conf" unless mongrel_conf
+    set :mongrel_conf, "/etc/mongrel_cluster/#{application}.yml" unless mongrel_conf
   end
 
 end

data/resources/mongrel_cluster

@@ -12,6 +12,13 @@
 CONF_DIR=/etc/mongrel_cluster
 RETVAL=0
 
+
+# Gracefully exit if the controller is missing.
+which mongrel_cluster_ctl >/dev/null || exit 0
+
+# Go no further if config directory is missing.
+[ -d "$CONF_DIR" ] || exit 0
+
 case "$1" in
     start)
       mongrel_cluster_ctl start -c $CONF_DIR

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel_cluster
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-06-19 00:00:00 -04:00
+  version: 0.2.1
+date: 2006-09-11 00:00:00 -07:00
 summary: Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.
 require_paths: 
 - lib
@@ -34,11 +34,11 @@ files:
 - Rakefile
 - bin/mongrel_cluster_ctl
 - lib/mongrel_cluster
-- lib/mongrel_cluster/init.rb
 - lib/mongrel_cluster/recipes.rb
+- lib/mongrel_cluster/init.rb
 - tools/rakehelp.rb
-- resources/defaults.yaml
 - resources/mongrel_cluster
+- resources/defaults.yaml
 test_files: []
 
 rdoc_options: []
@@ -68,5 +68,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.13
+        version: 0.3.13.4
     version: