lib/mongrel_cluster/init.rb in mongrel_cluster-0.2.0 vs lib/mongrel_cluster/init.rb in mongrel_cluster-0.2.1

@@ -2,156 +2,134 @@
 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
+      
+      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"
     include Mongrel::Command::Base
     
@@ -168,13 +146,14 @@
         ['-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 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
 
     def validate
       @servers = @servers.to_i
@@ -202,9 +181,10 @@
       @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
       
       puts "Writing configuration file to #{@config_file}."
       File.open(@config_file,"w") {|f| f.write(@options.to_yaml)}
     end  
   end