perfectqueue 0.8.28 → 0.8.29

data/ChangeLog

@@ -1,4 +1,20 @@
 
+== 2014-04-02 version 0.8.29
+
+* Updated ChildProcessMonitor to kill grandchildren to not depend on
+  sys-proctable gem
+
+
+== 2014-03-31 version 0.8.28
+
+* Fixed ChildProcessMonitor when heartbeat pipe is closed
+
+
+== 2014-03-31 version 0.8.27
+
+* ChildProcessMonitor kills grandchildren as well when it force kills children.
+
+
 == 2014-03-27 version 0.8.26
 
 * Added delay before sending KILL signal to worker process when

data/lib/perfectqueue/multiprocess/child_process_monitor.rb

@@ -52,7 +52,7 @@ module PerfectQueue
 
         now = Time.now.to_i
         if delay == 0
-          kill_child(now, nil)
+          kill_children(now, nil)
           @kill_start_time = now
         else
           @kill_start_time = now + delay
@@ -88,7 +88,7 @@ module PerfectQueue
         # resend signal
         now = Time.now.to_i
         if @last_kill_time + kill_interval <= now
-          kill_child(now, graceful_kill_limit)
+          kill_children(now, graceful_kill_limit)
         end
 
         return false
@@ -107,19 +107,56 @@ module PerfectQueue
       end
 
       private
-      def kill_child(now, graceful_kill_limit)
+      def kill_children(now, graceful_kill_limit)
+        immediate = @kill_immediate || (graceful_kill_limit && @kill_start_time + graceful_kill_limit < now)
+
+        if immediate
+          pids = collect_child_pids(get_ppid_pids_map, [@pid], @pid)
+          pids.reverse_each {|pid|
+            kill_process(child, true)
+          }
+        else
+          kill_process(@pid, false)
+        end
+
+        @last_kill_time = now
+      end
+
+      def get_ppid_pids_map
+        ppid_pids = {}  # {ppid => [pid]}
+        `ps -ao pid,ppid`.each_line do |line|
+          if m = /^\s*(\d+)\s+(\d+)\s*$/.match(line)
+            (ppid_pids[m[2].to_i] ||= []) << m[1].to_i
+          end
+        end
+        return ppid_pids
+      # We can ignore errors but not necessary
+      #rescue
+      #  return {}
+      end
+
+      def collect_child_pids(ppid_pids, results, parent_pid)
+        if pids = ppid_pids[parent_pid]
+          pids.each {|pid|
+            results << pid
+            collect_child_pids(ppid_pids, results, pid)
+          }
+        end
+        results
+      end
+
+      def kill_process(pid, immediate)
         begin
-          if @kill_immediate || (graceful_kill_limit && @kill_start_time + graceful_kill_limit < now)
-            @log.debug "sending SIGKILL to pid=#{@pid} for immediate stop"
-            Process.kill(:KILL, @pid)
+          if immediate
+            @log.debug "sending SIGKILL to pid=#{pid} for immediate stop"
+            Process.kill(:KILL, pid)
           else
-            @log.debug "sending SIGTERM to pid=#{@pid} for graceful stop"
-            Process.kill(:TERM, @pid)
+            @log.debug "sending SIGTERM to pid=#{pid} for graceful stop"
+            Process.kill(:TERM, pid)
           end
         rescue Errno::ESRCH, Errno::EPERM
           # TODO log?
         end
-        @last_kill_time = now
       end
     end
 

data/lib/perfectqueue/version.rb

@@ -1,3 +1,3 @@
 module PerfectQueue
-  VERSION = "0.8.28"
+  VERSION = "0.8.29"
 end

metadata

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