[patch] mongrel_cluster/files/mongrel_cluster_ctl.patch

mongrel_cluster_ctl.patch (text/plain), 2.03 KB, created by Nguyen Thai Ngoc Duy (RETIRED) on 2007-01-10 16:37:25 UTC

--- bin/mongrel_cluster_ctl.orig	1970-01-01 07:00:00.000000000 +0700
+++ bin/mongrel_cluster_ctl	2006-12-30 11:20:53.000000000 +0700
@@ -3,16 +3,17 @@
 
 require 'optparse'
 
-def run(command, verbose)
+def run(command)
   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
+      cmd += " -v" if @options[:verbose]
+      cmd += " -s" if command == "restart" && @options[:soft]
+      puts cmd if @options[:verbose]
       output = `#{cmd}`
-      puts output if verbose
+      puts output if @options[:verbose]
       puts "mongrel_rails cluster::#{command} returned an error." unless $?.success?     
     end
   end  
@@ -21,13 +22,15 @@
 @options = {}
 @options[:conf_path] = "/etc/mongrel_cluster"
 @options[:verbose] = false
+@options[:soft] = false
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: #{$0} (start|stop|restart) [options]"
+  opts.banner = "Usage: #{$0} (start|stop|restart|reload) [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 }
-
+  opts.on('-s', '--soft', "Do a soft restart rather than a process exit restart (only with restart command).") { |value| @options[:soft] = value }
+  
   if ARGV.empty?
     puts opts
     exit
@@ -48,17 +51,16 @@
 
 case @cmd[0]
 when "start": 
-  puts "Starting all mongrel_clusters..."
-  run "start", @options[:verbose]
+  run "start"
 when "stop":
-  puts "Stopping all mongrel_clusters..."
-  run "stop", @options[:verbose]
+  run "stop"
 when "restart":
-  puts "Restarting all mongrel_clusters..."
-  run "stop", @options[:verbose]
-  run "start", @options[:verbose]
+  run "restart"
+when "reload":
+  @options[:soft] = true
+  run "restart"
 else
  puts "Unknown command."
 end
 
-exit
\ No newline at end of file
+exit