unicorn_wrangler 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19c14c7fa55054a95ced0309e7572bd3917d518bd9906a7775adee3423d82b79
-  data.tar.gz: 0326a1740dd4a9b76ba21cd8e4bd45e11aed7a9109eb7a837948f70736104bed
+  metadata.gz: 3a3a8ecfbd1a4bb724bda20436ca8047d427e4aafcd69b066cb8dd151853e07b
+  data.tar.gz: aa7c119ec19b8580476b828227f20bb002045524e4c316fbd154495fa740511f
 SHA512:
-  metadata.gz: d6669d17513fc1eebcf1e7721bf331ce38c37ac145b2f66ea4622df50a1823673ce88bdd8092024d60caf88c543faea48a133a2dda108da60b5fb5094d7218a6
-  data.tar.gz: c5b1211ac5758cf840a7a63628095be835b5c409b1ce7660e1b5c399a65b6a58db342c01ac91c6a7cb8dc270d94a1c401921928bbe30765626fbc36216e36fcc
+  metadata.gz: 60429f9e58f17cac7ca81566a2427100d75e4e2a8b7e88dbe1304829b783e174e3308eb14248d594576944eab16e94ddbed88a3799e8b5c28c52b024de81d1c0
+  data.tar.gz: 57b724a224098c48f7ef71d7d0f7e41ffb8e9a000442b44a456b588ea11c2fe0234cfca68ac85ba0873380192179066df08631f2b910e7cd1462d7dcdaa05fdc

data/lib/unicorn_wrangler.rb

@@ -9,6 +9,7 @@ module UnicornWrangler
 
   class << self
     attr_reader :handlers
+    attr_accessor :sending_myself_term
 
     # called from unicorn config (usually config/unicorn.rb)
     # high level interface to keep setup consistent / simple
@@ -41,8 +42,13 @@ module UnicornWrangler
         end
 
         @hooks[:after_fork] = ->(*) do
-          Signal.trap :TERM do
-            Thread.new { logger.info 'worker intercepting TERM and doing nothing. Wait for master to send QUIT' }
+          # Signal.trap returns the trap that unicorn set, which is an exit!(0) and calls that when sending myself term
+          previous_trap = Signal.trap :TERM do
+            if sending_myself_term
+              previous_trap.call
+            else
+              Thread.new { logger.info 'worker intercepting TERM and doing nothing. Wait for master to send QUIT' }
+            end
           end
         end
       end
@@ -50,6 +56,11 @@ module UnicornWrangler
       Unicorn::HttpServer.prepend UnicornExtension
     end
 
+    def kill_worker
+      self.sending_myself_term = true # no need to clean up since we are dead after
+      Process.kill(:TERM, Process.pid)
+    end
+
     # called from the unicorn server after each request
     def perform_request
       returned = nil
@@ -116,7 +127,7 @@ module UnicornWrangler
 
       report_status "Killing", reason, memory, requests, request_time
 
-      Process.kill(:TERM, Process.pid)
+      UnicornWrangler.kill_worker
     end
 
     # expensive, do not run on every request

data/lib/unicorn_wrangler/version.rb

@@ -1,3 +1,3 @@
 module UnicornWrangler
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn_wrangler
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-23 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it