make new kill child logic opt-in

Author: hone

lib/resque/tasks.rb

@@ -15,6 +15,7 @@
       worker.verbose = ENV['LOGGING'] || ENV['VERBOSE']
       worker.very_verbose = ENV['VVERBOSE']
       worker.term_timeout = ENV['RESQUE_TERM_TIMEOUT'] || 4.0
+      worker.term_child = ENV['TERM_CHILD'].to_i || 1
     rescue Resque::NoQueueError
       abort "set QUEUE env var, e.g. $ QUEUE=critical,high rake resque:work"
     end

lib/resque/worker.rb

@@ -22,6 +22,9 @@ class Worker
 
     attr_accessor :term_timeout
 
+    # decide whether to use new_kill_child logic
+    attr_accessor :term_child
+
     attr_writer :to_s
 
     # Returns an array of all worker objects.
@@ -278,7 +281,11 @@ def register_signal_handlers
 
       begin
         trap('QUIT') { shutdown   }
-        trap('USR1') { kill_child }
+        if term_child
+          trap('USR1') { new_kill_child }
+        else
+          trap('USR1') { kill_child }
+        end
         trap('USR2') { pause_processing }
         trap('CONT') { unpause_processing }
       rescue ArgumentError
@@ -310,18 +317,36 @@ def shutdown
     # Kill the child and shutdown immediately.
     def shutdown!
       shutdown
-      kill_child
+      if term_child
+        new_kill_child
+      else
+        kill_child
+      end
     end
 
     # Should this worker shutdown as soon as current job is finished?
     def shutdown?
       @shutdown
     end
 
+    # Kills the forked child immediately, without remorse. The job it
+    # is processing will not be completed.
+    def kill_child
+      if @child
+        log! "Killing child at #{@child}"
+        if system("ps -o pid,state -p #{@child}")
+          Process.kill("KILL", @child) rescue nil
+        else
+          log! "Child #{@child} not found, restarting."
+          shutdown
+        end
+      end
+    end
+
     # Kills the forked child immediately with minimal remorse. The job it
     # is processing will not be completed. Send the child a TERM signal,
     # wait 5 seconds, and then a KILL signal if it has not quit
-    def kill_child
+    def new_kill_child
       if @child
         unless Process.waitpid(@child, Process::WNOHANG)
           log! "Sending TERM signal to child #{@child}"

test/worker_test.rb

@@ -469,6 +469,7 @@ def self.perform( run_time, rescue_time=nil )
 
           worker = Resque::Worker.new(:long_running_job)
           worker.term_timeout = 1
+          worker.term_child = 1
 
           worker.work(0)
           exit!