mongrel_cluster 0.1.1 → 0.2.0

data/bin/mongrel_cluster_ctl

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# Copyright (c) 2006 Bradley Taylor, bradley@railsmachine.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}"
+      cmd += " -v" if verbose
+      puts cmd if verbose
+      output = `#{cmd}`
+      puts output if verbose
+      puts "mongrel_rails cluster::#{command} returned an error." unless $?.success?     
+    end
+  end  
+end
+
+@options = {}
+@options[:conf_path] = "/etc/mongrel_cluster"
+@options[:verbose] = false
+
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{$0} (start|stop|restart) [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 }
+
+  if ARGV.empty?
+    puts opts
+    exit
+  else
+    @cmd = opts.parse!(ARGV)
+    if @cmd.nil?
+      puts opts
+      exit
+    end
+  end
+  
+end
+
+if @options[:conf_path] == nil && !File.directory?(@options[:conf_path])
+  puts "Invalid path to mongrel_cluster configuration files: #{@options[:conf_path]}"
+  exit
+end
+
+case @cmd[0]
+when "start": 
+  puts "Starting all mongrel_clusters..."
+  run "start", @options[:verbose]
+when "stop":
+  puts "Stopping all mongrel_clusters..."
+  run "stop", @options[:verbose]
+when "restart":
+  puts "Restarting all mongrel_clusters..."
+  run "stop", @options[:verbose]
+  run "start", @options[:verbose]
+else
+ puts "Unknown command."
+end
+
+exit

data/lib/mongrel_cluster/init.rb

@@ -8,7 +8,10 @@ module Cluster
     include Mongrel::Command::Base
     
     def configure
-      options [['-C', '--config PATH', "Path to configuration file", :@config_file, "config/mongrel_cluster.yml"]]
+      options [ 
+        ['-C', '--config PATH', "Path to configuration file", :@config_file, "config/mongrel_cluster.yml"],
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]
+      ]
     end
 
     def validate
@@ -44,10 +47,16 @@ module Cluster
         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
-        status = `#{cmd}`
-        puts status
+        
+        puts cmd if @verbose
+        output = `#{cmd}`
+        unless $?.success?
+          puts cmd unless @verbose
+          puts output
+        end
       end
     end
   end
@@ -58,7 +67,8 @@ module Cluster
     def configure
       options [
        ['-C', '--config PATH', "Path to config file", :@config_file, "config/mongrel_cluster.yml"],
-       ['-f', '--force', "Force the shutdown.", :@force, false]
+       ['-f', '--force', "Force the shutdown.", :@force, false],
+       ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]
       ]
     end
 
@@ -87,9 +97,12 @@ module Cluster
         argv << "-c #{@options["cwd"]}" if @options["cwd"]
         argv << "-f" if @force
         cmd = argv.join " "
-        puts cmd
-        status = `#{cmd}`
-        puts status
+        puts cmd if @verbose
+        output = `#{cmd}`
+        unless $?.success?
+          puts cmd unless @verbose
+          puts output
+        end
       end
     end  
   end
@@ -100,7 +113,8 @@ module Cluster
     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]       
+        ['-s', '--soft', "Do a soft restart rather than a process exit restart", :@soft, false],
+        ['-v', '--verbose', "Print all called commands and output.", :@verbose, false]       
       ]
     end
 
@@ -128,9 +142,12 @@ module Cluster
         argv << "-c #{@options["cwd"]}" if @options["cwd"]
         argv << "-s" if @soft
         cmd = argv.join " "
-        puts cmd
-        status = `#{cmd}`
-        puts status
+        puts cmd if @verbose
+        output = `#{cmd}`
+        unless $?.success?
+          puts cmd unless @verbose
+          puts output
+        end
       end
     end  
   end
@@ -153,7 +170,9 @@ 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 config file", :@config_file, "config/mongrel_cluster.yml"],
+        ['', '--user USER', "User to run as", :@user, nil],
+        ['', '--group GROUP', "Group to run as", :@group, nil]
       ]
     end
 
@@ -183,6 +202,8 @@ module Cluster
       @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
       
       puts "Writing configuration file to #{@config_file}."
       File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}

data/lib/mongrel_cluster/recipes.rb

@@ -1,41 +1,60 @@
 Capistrano.configuration(:must_exist).load do
-  set :mongrel_servers, "2"
-  set :mongrel_port, "8000"
+  set :mongrel_servers, 2
+  set :mongrel_port, 8000
   set :mongrel_address, "127.0.0.1"
   set :mongrel_environment, "production"
-  set(:mongrel_config) { "#{deploy_to}/config/mongrel_cluster.yml" }
+  set :mongrel_conf, nil
+  set :mongrel_user, nil
+  set :mongrel_group, nil
   
   desc <<-DESC
   Configure Mongrel processes on the app server. This uses the :use_sudo
-  variable to determine whether to use sudo or not.
+  variable to determine whether to use sudo or not. By default, :use_sudo is
+  set to true.
   DESC
   task :configure_mongrel_cluster, :roles => :app do
-    send(run_method, "if [ ! -d #{File.dirname(mongrel_config)} ]; then mkdir -p #{File.dirname(mongrel_config)}; fi")
-    send(run_method, "mongrel_rails cluster::configure -N #{mongrel_servers} -p #{mongrel_port} -e #{mongrel_environment} -a #{mongrel_address} -c #{current_path} -C #{mongrel_config}")
+    set_mongrel_conf
+        
+    argv = []
+    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 << "--user #{mongrel_user}" if mongrel_user
+    argv << "--group #{mongrel_group}" if mongrel_group
+    cmd = argv.join " "
+    send(run_method, cmd)
   end
   
   desc <<-DESC
-  Start Mongrel processes on the app server. This uses the :use_sudo
-  variable to determine whether to use sudo or not.
+  Start 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 :start_mongrel_cluster , :roles => :app do
-    send(run_method, "mongrel_rails cluster::start -C #{mongrel_config}")
+    set_mongrel_conf
+    send(run_method, "mongrel_rails cluster::start -C #{mongrel_conf}")
   end
   
   desc <<-DESC
-  Restart the Mongrel processes on the app server. This uses the :use_sudo
-  variable to determine whether to use sudo or not. 
+  Restart the Mongrel processes on the app server by starting and stopping the cluster. This uses the :use_sudo
+  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
-    send(run_method, "mongrel_rails cluster::restart -C #{mongrel_config}")
+    stop_mongrel_cluster
+    start_mongrel_cluster
   end
   
   desc <<-DESC
-  Stop the Mongrel processes on the app server. This uses the :use_sudo
-  variable to determine whether to use sudo or not.
+  Stop 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 :stop_mongrel_cluster , :roles => :app do
-    send(run_method, "mongrel_rails cluster::stop -C #{mongrel_config}")
+    set_mongrel_conf
+    send(run_method, "mongrel_rails cluster::stop -C #{mongrel_conf}")
   end
   
   desc <<-DESC
@@ -51,5 +70,9 @@ Capistrano.configuration(:must_exist).load do
   task :spinner, :roles => :app do
     start_mongrel_cluster
   end
+  
+  def set_mongrel_conf
+    set :mongrel_conf, "/etc/mongrel_cluster/#{application}.conf" unless mongrel_conf
+  end
 
 end

data/resources/mongrel_cluster

@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Copyright (c) 2006 Bradley Taylor, bradley@railsmachine.com
+#
+# mongrel_cluster       Startup script for Mongrel clusters.
+#
+# chkconfig: - 85 15
+# description: mongrel_cluster manages multiple Mongrel processes for use \
+#              behind a load balancer.
+#              
+
+CONF_DIR=/etc/mongrel_cluster
+RETVAL=0
+
+case "$1" in
+    start)
+      mongrel_cluster_ctl start -c $CONF_DIR
+      RETVAL=$?
+  ;;
+    stop)
+      mongrel_cluster_ctl stop -c $CONF_DIR
+      RETVAL=$?
+  ;;
+    restart)
+      mongrel_cluster_ctl restart -c $CONF_DIR
+      RETVAL=$?
+  ;;
+    *)
+      echo "Usage: mongrel_cluster {start|stop|restart}"
+      exit 1
+  ;;
+esac      
+
+exit $RETVAL

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: mongrel_cluster
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-05-01 00:00:00 -04:00
+  version: 0.2.0
+date: 2006-06-19 00:00:00 -04:00
 summary: Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.
 require_paths: 
 - lib
@@ -13,7 +13,7 @@ homepage:
 rubyforge_project: 
 description: Mongrel plugin that provides commands and Capistrano tasks for managing multiple Mongrel processes.
 autorequire: 
-default_executable: 
+default_executable: mongrel_cluster_ctl
 bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
@@ -32,19 +32,21 @@ files:
 - LICENSE
 - README
 - Rakefile
+- bin/mongrel_cluster_ctl
 - lib/mongrel_cluster
 - lib/mongrel_cluster/init.rb
 - lib/mongrel_cluster/recipes.rb
 - tools/rakehelp.rb
 - resources/defaults.yaml
+- resources/mongrel_cluster
 test_files: []
 
 rdoc_options: []
 
 extra_rdoc_files: 
 - README
-executables: []
-
+executables: 
+- mongrel_cluster_ctl
 extensions: []
 
 requirements: []
@@ -66,5 +68,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.12.4
+        version: 0.3.13
     version: