resque-heroku-signals 2.5.0 → 2.5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd0d2ff7c73bef401f2abd72465d542e9c8d3ec19dbde5f6f2aeede596f5c8e
-  data.tar.gz: 0e3332150e08504abab3b7604fad850caf7bdbedf95ed93808e9c0efa8e95e40
+  metadata.gz: 62ff5405f78d9e6ad1be2a2807541180adb14ead8924102cc54cefe3d6a0a898
+  data.tar.gz: defed1cc3cd6016402502aab6c53f8e4a610bfc9e6f8c6e17ce3241f57fe7330
 SHA512:
-  metadata.gz: 1251aa0f48ab31cee2741c5b5eafeae7789b52a261bbc4469c51295f92d01e1128bd2f7a6eeb3d2cb3c309213bd2fd4c5a1deab84a0aeb062b66fe57e5f69dde
-  data.tar.gz: 80319b8d09d046e50b56c59ae904c1e0835f9e87a50bad3fb1aece55382b87775a1b64c2c5c54b2a0ce257fcda8069a2c6e53bb10c07eb414098e3c32360bb4f
+  metadata.gz: 703923f42deee729bd04abdb26bbde32a55a6f098007be6b2959c624eb47f9d172d48a3bb9101590df0203c6849fe4a844a5ff274b6594f63cffaaf0fba1f90f
+  data.tar.gz: e3bb87939927ebdb2511f7b44e32f6669d2abe5d39ae9c660e8991fd88e0a4549d87f156e0bed4453f64e93ddace4dd01491609393f49f78dada7224640ce9bc

data/.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
           - 6379:6379
     strategy:
       matrix:
-        ruby-version: ['3.0', '2.7']
+        ruby-version: ['3.2', '3.1', '3.0', '2.7']
 
     steps:
       - uses: actions/checkout@v3

data/lib/resque-heroku-signals.rb

@@ -12,24 +12,43 @@ end
 #   https://github.com/resque/resque/blame/v2.0.0/lib/resque/worker.rb#L406
 # https://github.com/resque/resque/issues/1559#issuecomment-310908574
 Resque::Worker.class_eval do
-  def unregister_signal_handlers
-    trap('TERM') do
-      $HEROKU_WILL_TERMINATE_RESQUE = true
+  # In this patched implementation, the only change is that the worker sends
+  # SIGINT to the child, the rest is copied verbatim.
+  def new_kill_child
+    if @child
+      unless child_already_exited?
+        if pre_shutdown_timeout && pre_shutdown_timeout > 0.0
+          log_with_severity :debug, "Waiting #{pre_shutdown_timeout.to_f}s for child process to exit"
+          return if wait_for_child_exit(pre_shutdown_timeout)
+        end
 
-      trap('TERM') do
-        log_with_severity :info, "[resque-heroku] received second term signal, throwing term exception"
+        log_with_severity :debug, "Sending INT signal to child #{@child}"
+        Process.kill("INT", @child)
 
-        trap('TERM') do
-          log_with_severity :info, "[resque-heroku] third or more time receiving TERM, ignoring"
+        if wait_for_child_exit(term_timeout)
+          return
+        else
+          log_with_severity :debug, "Sending KILL signal to child #{@child}"
+          Process.kill("KILL", @child)
         end
-
-        raise Resque::TermException.new("SIGTERM")
+      else
+        log_with_severity :debug, "Child #{@child} already quit."
       end
+    end
+  rescue SystemCallError
+    log_with_severity :error, "Child #{@child} already quit and reaped."
+  end
 
-      log_with_severity :info, "[resque-heroku] received first term signal from heroku, ignoring"
+  def unregister_signal_handlers
+    trap("TERM") do
+      log_with_severity :debug, "Got TERM signal from Heroku."
+      $HEROKU_WILL_TERMINATE_RESQUE = true
     end
 
-    trap('INT', 'DEFAULT')
+    trap("INT") do
+      log_with_severity :debug, "Got INT signal from the worker."
+      raise Resque::TermException.new("SIGINT")
+    end
 
     begin
       trap('QUIT', 'DEFAULT')

data/resque-heroku-signals.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "resque-heroku-signals"
-  spec.version       = '2.5.0'
+  spec.version       = '2.5.0.1'
   spec.authors       = ["Michael Bianco"]
   spec.email         = ["mike@mikebian.co"]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-heroku-signals
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.0.1
 platform: ruby
 authors:
 - Michael Bianco
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-01 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque