inst-jobs 0.15.11 → 0.15.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd4650c1710db962640dcdafd9f9ed5673b09dc3938b14f3cc3285110e0ac576
-  data.tar.gz: b8e243c78492f7aedaaaefa2a3dfff639267d19c47939f24f45bac22bd534c77
+  metadata.gz: 9ad35b931510d3d138d9e9d9f615421150980b28c70478d55303acd36284dc68
+  data.tar.gz: 77a470c49f48a0c7100034e38f46a45d4b31c36d4285e881e4604b89b44011bb
 SHA512:
-  metadata.gz: 54a8f4f9bcf9d67b1e7f74e0e0dee25f53e46312950e0eab9868088d1bdaf8d841f621676c2c2fc0703df590fe677380a8b63eaee3d53e3c10ef584597e50e10
-  data.tar.gz: 2e6e2590ed99bafa326e73cc32d3eb08840be94d48cb7cf0251dfc17c7a9f41907a75da08dabfd415f416d05aa432187d2ad78460527bda2c2df3de2742d7f77
+  metadata.gz: a070140349676442884f879622fd5398fa83c912187fa07f1ab231c38ef7c9d6a04ad485ff6c83b708e6fae31401a6a3aa5e554c3fa11fa7dc89bfe69c29ede2
+  data.tar.gz: e3cb216bcb2f0cdc886733ca8f00efd284873aa828e9f55e26138c688e6ac7cb182aec0da663defd117f26d1f3062901a2c0f1f6eec39275d6dcc58188d2e3c5

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.15.11"
+  VERSION = "0.15.12"
 end

data/lib/delayed/worker.rb

@@ -118,6 +118,7 @@ class Worker
         when :INT, :TERM
           @exit = true # get the main thread to bail early if it's waiting for a job
           work_thread.raise(SystemExit) # Force the main thread to bail out of the current job
+          cleanup! # we're going to get SIGKILL'd in a moment, so clean up asap
           break
         when :QUIT
           @exit = true
@@ -138,13 +139,26 @@ class Worker
     Rails.logger.fatal("Child process died: #{e.inspect}") rescue nil
     self.class.lifecycle.run_callbacks(:exceptional_exit, self, e) { }
   ensure
-    health_check.stop
-    work_queue.close
+    cleanup!
+
     if signal_processor
       signal_processor.kill
       signal_processor.join
     end
+  end
+
+  def cleanup!
+    return if cleaned?
+
+    health_check.stop
+    work_queue.close
     Delayed::Job.clear_locks!(name)
+
+    @cleaned = true
+  end
+
+  def cleaned?
+    @cleaned
   end
 
   def run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.15.11
+  version: 0.15.12
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-29 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord