averell23-watchdogger 0.2.0 → 0.2.1

data/CHANGES

@@ -0,0 +1,4 @@
+=0.2.1
+
+* Fixed log watcher not resetting status after trigger
+* The killer action will now avoid re-execution for a configurable amount of time.

data/lib/watcher/log_watcher.rb

@@ -42,6 +42,7 @@ module Watcher
       is_triggered = false
       if(triggered?)
         is_triggered = "Found #{@match_str} in #{@file_name}"
+        reset_trigger
       end
       is_triggered
     rescue Exception => e

data/lib/watcher_action/kill_process.rb

@@ -12,15 +12,24 @@ module WatcherAction
   #            signal, if the process didn't die.
   #            Defaults to KILL
   # [*wait*] Time to wait between signals (Default: 5)
+  # [*restart_time*] Time allowed for the process to restart. The action
+  #                  will not do anything if called again during this
+  #                  interval. (Default: 120)
   class KillProcess
     
     def initialize(config)
       @pidfile = config.get_value(:pidfile, false)
       @signals = config.get_list(:signal, 'KILL')
       @wait = config.get_value(:wait, 5).to_i
+      @restart_time = config.get_value(:restart_time, 120).to_i
     end
     
     def execute(event)
+      if(@last_action && (Time.now - @last_action).floor < @restart_time)
+        dog_log.info("Ignoring restart request in restarting time.")
+        return false
+      end
+      
       Thread.new(@signals, @wait, @pidfile) do |signals, wait, pidfile|
         pid = File.open(pidfile) { |io| io.read }.to_i
         signals.each_with_index do |signal, index|
@@ -33,6 +42,7 @@ module WatcherAction
           end
         end
       end
+      @last_action = Time.now
     rescue Exception => e
       dog_log.warn { "Unable to kill process: #{e}" }
     end

data/test/kill_process_test.rb

@@ -5,11 +5,9 @@ PIDFILE = 'test.pid'
 class KillProcessTest < Test::Unit::TestCase
   
   def setup
-    @killer = WatcherAction::KillProcess.new(:pidfile => PIDFILE)
+    @killer = WatcherAction::KillProcess.new(:pidfile => PIDFILE, :restart_time => '3')
     # Fork a dummy process that we can kill
-    @pid = Process.fork { loop { sleep 1 }}
-    @proc = Process.detach(@pid)
-    File.open(PIDFILE, 'w') { |io| io << @pid }
+    fork_process
   end
   
   def teardown
@@ -26,4 +24,30 @@ class KillProcessTest < Test::Unit::TestCase
     assert_equal(false, @proc.status)
   end
   
+  def test_restart_killer
+    assert_not_equal(false, @proc.status)
+    @killer.execute(WatcherEvent.new)
+    sleep 1 # Wait for the sleep - the ruby process will handle the kill only then
+    assert_equal(false, @proc.status)
+    fork_process
+    # Within the restart time, this should be ignored
+    @killer.execute(WatcherEvent.new)
+    sleep 1
+    assert_not_equal(false, @proc.status)
+    sleep 2
+    # Now it should work again
+    @killer.execute(WatcherEvent.new)
+    sleep 1
+    assert_equal(false, @proc.status)
+  end
+  
+  private
+  
+  def fork_process
+    assert(!@proc || @proc.status == false, "Cannot refork with old proc running")
+    @pid = Process.fork { loop { sleep 1 }}
+    @proc = Process.detach(@pid)
+    File.open(PIDFILE, 'w') { |io| io << @pid }
+  end
+  
 end

data/test/log_watcher_test.rb

@@ -29,10 +29,11 @@ class LogWatcherTest < Test::Unit::TestCase
   def test_watcher_trigger
     File.open(logfile, 'a') do |io|
       20.times { io << 'nothing special' }
-      io << 'da_test'
+      10.times { io << 'da_test' }
     end
     sleep 2
     assert_kind_of(String, @watcher.watch_it!)
+    assert_equal(false, @watcher.watch_it!)
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: averell23-watchdogger
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Daniel Hahn
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-17 00:00:00 -07:00
+date: 2009-07-21 00:00:00 -07:00
 default_executable: watchdogger
 dependencies: 
 - !ruby/object:Gem::Dependency