perfectqueue 0.8.25 → 0.8.26

data/ChangeLog

@@ -1,4 +1,11 @@
 
+== 2014-03-27 version 0.8.26
+
+* Added delay before sending KILL signal to worker process when
+  a heartbeat pipe is closed or stopped
+* Added child_heartbeat_kill_delay parameter
+
+
 == 2014-02-18 version 0.8.25
 
 * rdb_compat: submit method supports :compression => 'gzip' option

data/lib/perfectqueue/multiprocess/child_process_monitor.rb

@@ -43,16 +43,20 @@ module PerfectQueue
         return Time.now.to_i - @last_heartbeat <= limit
       end
 
-      def start_killing(immediate)
+      def start_killing(immediate, delay=0)
         if immediate && !@kill_immediate
           @kill_immediate = true  # escalation
         elsif @kill_start_time
           return
         end
 
-        now = Time.now.to_i
-        kill_child(now, nil)
-        @kill_start_time = now
+        if delay == 0
+          now = Time.now.to_i
+          kill_child(now, nil)
+          @kill_start_time = now
+        else
+          @kill_start_time = now + delay
+        end
       end
 
       def killing_status
@@ -72,7 +76,7 @@ module PerfectQueue
 
         begin
           if Process.waitpid(@pid, Process::WNOHANG)
-            @log.info "Processor exited pid=#{@pid}"
+            @log.info "Processor exited and joined pid=#{@pid}"
             return true
           end
         rescue Errno::ECHILD

data/lib/perfectqueue/multiprocess/fork_processor.rb

@@ -37,6 +37,7 @@ module PerfectQueue
         @child_kill_interval = config[:child_kill_interval] || 2.0
         @child_graceful_kill_limit = config[:child_graceful_kill_limit] || nil
         @child_fork_frequency_limit = config[:child_fork_frequency_limit] || 5.0
+        @child_heartbeat_kill_delay = config[:child_heartbeat_kill_delay] || 10
         @log = config[:logger]
         @config = config  # for child process
 
@@ -71,11 +72,11 @@ module PerfectQueue
               end
             rescue EOFError
               @log.error "Heartbeat pipe is closed. Restarting child process id=#{@processor_id} pid=#{c.pid}."
-              c.start_killing(true)
+              c.start_killing(true, @child_heartbeat_kill_delay)
             rescue
               @log.error "Unknown error: #{$!.class}: #{$!}: Restarting child process id=#{@processor_id} pid=#{c.pid}."
               $!.backtrace.each {|bt| @log.warn "\t#{bt}" }
-              c.start_killing(false)
+              c.start_killing(true, @child_heartbeat_kill_delay)
             end
           end
 

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.25"
+  VERSION = "0.8.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfectqueue
 version: !ruby/object:Gem::Version
-  version: 0.8.25
+  version: 0.8.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel