god 0.11.0 → 0.12.0

data/lib/god/behavior.rb

@@ -1,10 +1,10 @@
 module God
-  
+
   class Behavior
     include Configurable
-    
+
     attr_accessor :watch
-    
+
     # Generate a Behavior of the given kind. The proper class is found by camel casing the
     # kind (which is given as an underscored symbol).
     #   +kind+ is the underscored symbol representing the class (e.g. foo_bar for God::Behaviors::FooBar)
@@ -16,31 +16,31 @@ module God
     rescue NameError
       raise NoSuchBehaviorError.new("No Behavior found with the class name God::Behaviors::#{sym}")
     end
-    
+
     def valid?
       true
     end
-        
+
     #######
-    
+
     def before_start
     end
-    
+
     def after_start
     end
-    
+
     def before_restart
     end
-    
+
     def after_restart
     end
-    
+
     def before_stop
     end
-    
+
     def after_stop
     end
-    
+
     # Construct the friendly name of this Behavior, looks like:
     #
     # Behavior FooBar on Watch 'baz'
@@ -48,5 +48,5 @@ module God
       "Behavior " + super + " on Watch '#{self.watch.name}'"
     end
   end
-  
-end
+
+end

data/lib/god/behaviors/clean_pid_file.rb

@@ -1,21 +1,21 @@
 module God
   module Behaviors
-    
+
     class CleanPidFile < Behavior
       def valid?
         valid = true
         valid &= complain("Attribute 'pid_file' must be specified", self) if self.watch.pid_file.nil?
         valid
       end
-  
+
       def before_start
         File.delete(self.watch.pid_file)
-        
+
         "deleted pid file"
       rescue
         "no pid file to delete"
       end
     end
-  
+
   end
-end
+end

data/lib/god/behaviors/clean_unix_socket.rb

@@ -1,21 +1,21 @@
 module God
   module Behaviors
-    
+
     class CleanUnixSocket < Behavior
       def valid?
         valid = true
         valid &= complain("Attribute 'unix_socket' must be specified", self) if self.watch.unix_socket.nil?
         valid
-      end 
-      
-      def before_start 
+      end
+
+      def before_start
         File.delete(self.watch.unix_socket)
-        
-        "deleted unix socket" 
-      rescue 
-        "no unix socket to delete" 
+
+        "deleted unix socket"
+      rescue
+        "no unix socket to delete"
       end
     end
-  
+
   end
-end
+end

data/lib/god/behaviors/notify_when_flapping.rb

@@ -1,44 +1,44 @@
 module God
   module Behaviors
-    
+
     class NotifyWhenFlapping < Behavior
-      attr_accessor :failures # number of failures 
+      attr_accessor :failures # number of failures
       attr_accessor :seconds  # number of seconds
       attr_accessor :notifier # class to notify with
-      
+
       def initialize
         super
         @startup_times = []
       end
-      
+
       def valid?
         valid = true
         valid &= complain("Attribute 'failures' must be specified", self) unless self.failures
         valid &= complain("Attribute 'seconds' must be specified", self) unless self.seconds
         valid &= complain("Attribute 'notifier' must be specified", self) unless self.notifier
-                
+
         # Must take one arg or variable args
         unless self.notifier.respond_to?(:notify) and [1,-1].include?(self.notifier.method(:notify).arity)
           valid &= complain("The 'notifier' must have a method 'notify' which takes 1 or variable args", self)
         end
-        
+
         valid
       end
-  
+
       def before_start
         now = Time.now.to_i
         @startup_times << now
         check_for_flapping(now)
       end
-      
+
       def before_restart
         now = Time.now.to_i
         @startup_times << now
         check_for_flapping(now)
       end
-      
+
       private
-        
+
         def check_for_flapping(now)
           @startup_times.select! {|time| time >= now - self.seconds }
           if @startup_times.length >= self.failures
@@ -46,6 +46,6 @@ module God
           end
         end
     end
-  
+
   end
-end
+end

data/lib/god/cli/command.rb

@@ -1,20 +1,20 @@
 module God
   module CLI
-    
+
     class Command
       def initialize(command, options, args)
         @command = command
         @options = options
         @args = args
-        
+
         dispatch
       end
-      
+
       def setup
         # connect to drb unix socket
         DRb.start_service("druby://127.0.0.1:0")
         @server = DRbObject.new(nil, God::Socket.socket(@options[:port]))
-        
+
         # ping server to ensure that it is responsive
         begin
           @server.ping
@@ -23,7 +23,7 @@ module God
           abort
         end
       end
-      
+
       def dispatch
         if %w{load status signal log quit terminate}.include?(@command)
           setup
@@ -38,33 +38,46 @@ module God
           abort
         end
       end
-      
+
       def load_command
         file = @args[1]
-          
-        puts "Sending '#{@command}' command"
+        action = @args[2] || 'leave'
+
+        unless ['stop', 'remove', 'leave', ''].include?(action)
+          puts "Command '#{@command}' action must be either 'stop', 'remove' or 'leave'"
+          exit(1)
+        end
+
+        puts "Sending '#{@command}' command with action '#{action}'"
         puts
-        
+
         unless File.exist?(file)
           abort "File not found: #{file}"
         end
-        
-        names, errors = *@server.running_load(File.read(file), File.expand_path(file))
-        
+
+        affected, errors, removed = *@server.running_load(File.read(file), File.expand_path(file), action)
+
         # output response
-        unless names.empty?
+        unless affected.empty?
           puts 'The following tasks were affected:'
           names.each do |w|
             puts '  ' + w
           end
         end
-        
+
+        unless removed.empty?
+          puts 'The following tasks were removed:'
+          removed.each do |w|
+            puts '  ' + w
+          end
+        end
+
         unless errors.empty?
           puts errors
           exit(1)
         end
       end
-      
+
       def status_command
         exitcode = 0
         statuses = @server.status
@@ -74,13 +87,13 @@ module God
           groups[g] ||= {}
           groups[g][name] = status
         end
-        
+
         if item = @args[1]
           if single = statuses[item]
             # specified task (0 -> up, 1 -> unmonitored, 2 -> other)
             state = single[:state]
             puts "#{item}: #{state}"
-            exitcode = state == :up ? 0 : (state == :unmonitored ? 1 : 2) 
+            exitcode = state == :up ? 0 : (state == :unmonitored ? 1 : 2)
           elsif groups[item]
             # specified group (0 -> up, N -> other)
             puts "#{item}:"
@@ -105,21 +118,21 @@ module God
             end
           end
         end
-        
+
         exit(exitcode)
       end
-      
+
       def signal_command
         # get the name of the watch/group
         name = @args[1]
         signal = @args[2]
-        
+
         puts "Sending signal '#{signal}' to '#{name}'"
-        
+
         t = Thread.new { loop { sleep(1); STDOUT.print('.'); STDOUT.flush; sleep(1) } }
-        
+
         watches = @server.signal(name, signal)
-        
+
         # output response
         t.kill; STDOUT.puts
         unless watches.empty?
@@ -131,17 +144,17 @@ module God
           puts 'No matching task or group'
         end
       end
-      
+
       def log_command
         begin
           Signal.trap('INT') { exit }
           name = @args[1]
-          
+
           unless name
             puts "You must specify a Task or Group name"
             exit!
           end
-          
+
           puts "Please wait..."
           t = Time.at(0)
           loop do
@@ -155,7 +168,7 @@ module God
           puts "The server went away"
         end
       end
-      
+
       def quit_command
         begin
           @server.terminate
@@ -164,7 +177,7 @@ module God
           puts 'Stopped god'
         end
       end
-      
+
       def terminate_command
         t = Thread.new { loop { STDOUT.print('.'); STDOUT.flush; sleep(1) } }
         if @server.stop_all
@@ -174,7 +187,7 @@ module God
           t.kill; STDOUT.puts
           puts "Could not stop all watches within #{@server.terminate_timeout} seconds"
         end
-        
+
         begin
           @server.terminate
           abort 'Could not stop god'
@@ -182,13 +195,13 @@ module God
           puts 'Stopped god'
         end
       end
-      
+
       def check_command
         Thread.new do
           begin
             event_system = God::EventHandler.event_system
             puts "using event system: #{event_system}"
-            
+
             if God::EventHandler.loaded?
               puts "starting event handler"
               God::EventHandler.start
@@ -196,24 +209,24 @@ module God
               puts "[fail] event system did not load"
               exit(1)
             end
-            
+
             puts 'forking off new process'
-            
+
             pid = fork do
               loop { sleep(1) }
             end
-            
+
             puts "forked process with pid = #{pid}"
-            
+
             God::EventHandler.register(pid, :proc_exit) do
               puts "[ok] process exit event received"
               exit!(0)
             end
-            
+
             sleep(1)
-            
+
             puts "killing process"
-            
+
             ::Process.kill('KILL', pid)
             ::Process.waitpid(pid)
           rescue => e
@@ -221,24 +234,24 @@ module God
             puts e.backtrace.join("\n")
           end
         end
-        
+
         sleep(2)
-        
+
         puts "[fail] never received process exit event"
         exit(1)
       end
-      
+
       def lifecycle_command
         # get the name of the watch/group
         name = @args[1]
-        
+
         puts "Sending '#{@command}' command"
-        
+
         t = Thread.new { loop { sleep(1); STDOUT.print('.'); STDOUT.flush; sleep(1) } }
-        
+
         # send @command
         watches = @server.control(name, @command)
-        
+
         # output response
         t.kill; STDOUT.puts
         unless watches.empty?
@@ -251,6 +264,6 @@ module God
         end
       end
     end # Command
-    
+
   end
 end