Refactor the hard timeout codepaths

lib/pitchfork/children.rb

@@ -107,6 +107,33 @@ def each_worker(&block)
       @workers.each_value(&block)
     end
 
+    def soft_kill_all(sig)
+      each do |child|
+        child.soft_kill(sig)
+      end
+    end
+
+    def hard_kill(sig, child)
+      child.hard_kill(sig)
+    rescue Errno::ESRCH
+      reap(child.pid)
+      child.close
+    end
+
+    def hard_kill_all(sig)
+      each do |child|
+        hard_kill(sig, child)
+      end
+    end
+
+    def hard_timeout(child)
+      child.hard_timeout!
+    rescue Errno::ESRCH
+      reap(child.pid)
+      child.close
+      true
+    end
+
     def workers
       @workers.values
     end

lib/pitchfork/http_server.rb

@@ -396,15 +396,15 @@ def stop(graceful = true)
       limit = Pitchfork.time_now + timeout
       until @children.workers.empty? || Pitchfork.time_now > limit
         if graceful
-          soft_kill_each_child(:TERM)
+          @children.soft_kill_all(:TERM)
         else
-          kill_each_child(:INT)
+          @children.hard_kill_all(:INT)
         end
         if monitor_loop(false) == StopIteration
           return StopIteration
         end
       end
-      kill_each_child(:KILL)
+      @children.hard_kill_all(:KILL)
       @promotion_lock.unlink
     end
 
@@ -506,25 +506,28 @@ def murder_lazy_workers
           next
         else # worker is out of time
           next_sleep = 0
-          if worker.mold?
-            logger.error "mold pid=#{worker.pid} timed out, killing"
-          else
-            logger.error "worker=#{worker.nr} pid=#{worker.pid} timed out, killing"
-          end
+          hard_timeout(worker)
+        end
+      end
 
-          if @after_worker_hard_timeout
-            begin
-              @after_worker_hard_timeout.call(self, worker)
-            rescue => error
-              Pitchfork.log_error(@logger, "after_worker_hard_timeout callback", error)
-            end
-          end
+      next_sleep <= 0 ? 1 : next_sleep
+    end
 
-          kill_worker(:KILL, worker.pid) # take no prisoners for hard timeout violations
+    def hard_timeout(worker)
+      if @after_worker_hard_timeout
+        begin
+          @after_worker_hard_timeout.call(self, worker)
+        rescue => error
+          Pitchfork.log_error(@logger, "after_worker_hard_timeout callback", error)
         end
       end
 
-      next_sleep <= 0 ? 1 : next_sleep
+      if worker.mold?
+        logger.error "mold pid=#{worker.pid} timed out, killing"
+      else
+        logger.error "worker=#{worker.nr} pid=#{worker.pid} timed out, killing"
+      end
+      @children.hard_timeout(worker) # take no prisoners for hard timeout violations
     end
 
     def trigger_refork
@@ -930,15 +933,6 @@ def kill_worker(signal, wpid)
       worker = @children.reap(wpid) and worker.close rescue nil
     end
 
-    # delivers a signal to each worker
-    def kill_each_child(signal)
-      @children.each { |w| kill_worker(signal, w.pid) }
-    end
-
-    def soft_kill_each_child(signal)
-      @children.each { |worker| worker.soft_kill(signal) }
-    end
-
     # returns an array of string names for the given listener array
     def listener_names(listeners = LISTENERS)
       listeners.map { |io| sock_name(io) }

lib/pitchfork/worker.rb

@@ -139,6 +139,14 @@ def soft_kill(sig) # :nodoc:
       success
     end
 
+    def hard_kill(sig)
+      Process.kill(sig, pid)
+    end
+
+    def hard_timeout!
+      hard_kill(:KILL)
+    end
+
     # this only runs when the Rack app.call is not running
     # act like a listener
     def accept_nonblock(exception: nil) # :nodoc: