unicorn_wrangler 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59947ed43ab082da1be724e6a29d42b65127f90d
-  data.tar.gz: 27c530b49b897af2ee2b922a0df9e03fa929f190
+SHA256:
+  metadata.gz: 19c14c7fa55054a95ced0309e7572bd3917d518bd9906a7775adee3423d82b79
+  data.tar.gz: 0326a1740dd4a9b76ba21cd8e4bd45e11aed7a9109eb7a837948f70736104bed
 SHA512:
-  metadata.gz: 5a041d009ad555382389ec005e2b288d4874562dcd4c63b02410c4305f79872d124ee68fa30ea99bd957ff4fa58a7aadc2da43391be5c66a4d414d4827e20bea
-  data.tar.gz: 363370e818b00151b5a99412deff1990538d1fcc9f43b8d2428b15a58e66c2fbabe22a9a3d3327fea18c3f22dfc4136769b0d2268bfeea8ef3eb8472fb8f9abe
+  metadata.gz: d6669d17513fc1eebcf1e7721bf331ce38c37ac145b2f66ea4622df50a1823673ce88bdd8092024d60caf88c543faea48a133a2dda108da60b5fb5094d7218a6
+  data.tar.gz: c5b1211ac5758cf840a7a63628095be835b5c409b1ce7660e1b5c399a65b6a58db342c01ac91c6a7cb8dc270d94a1c401921928bbe30765626fbc36216e36fcc

data/lib/unicorn_wrangler.rb

@@ -17,6 +17,7 @@ module UnicornWrangler
       kill_after_requests: 10000,
       gc_after_request_time: 10,
       kill_on_too_much_memory: {},
+      map_term_to_quit: false,
       logger:,
       stats: nil # provide a statsd client with your apps namespace to collect stats
     )
@@ -25,6 +26,27 @@ module UnicornWrangler
       @handlers << RequestKiller.new(logger, stats, kill_after_requests) if kill_after_requests
       @handlers << OutOfMemoryKiller.new(logger, stats, kill_on_too_much_memory) if kill_on_too_much_memory
       @handlers << OutOfBandGC.new(logger, stats, gc_after_request_time) if gc_after_request_time
+
+      @hooks = {}
+      if map_term_to_quit
+        # - on heroku & kubernetes all processes get TERM, so we need to trap in master and worker
+        # - trapping has to be done in the before_fork since unicorn sets up it's own traps on start
+        # - we cannot write to logger inside of a trap, so need to spawn a new Thread
+        # - manual test: add a slow route + rails s + curl + pkill -TERM -f 'unicorn master' - request finished?
+        @hooks[:before_fork] = -> do
+          Signal.trap :TERM do
+            Thread.new { logger.info 'master intercepting TERM and sending myself QUIT instead' }
+            Process.kill :QUIT, Process.pid
+          end
+        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' }
+          end
+        end
+      end
+
       Unicorn::HttpServer.prepend UnicornExtension
     end
 
@@ -39,9 +61,26 @@ module UnicornWrangler
     ensure
       @handlers.each { |handler| handler.call(@requests, @request_time) }
     end
+
+    def perform_hook(name)
+      if hook = @hooks[name]
+        hook.call
+      end
+    end
   end
 
   module UnicornExtension
+    # call our hook and the users hook since only a single hook can be configured at a time
+    # we need to call super so the @<hook> variables get set and unset properly in after_fork to not leak memory
+    [:after_fork, :before_fork].each do |hook|
+      define_method("#{hook}=") do |value|
+        super(->(*args) do
+          UnicornWrangler.perform_hook(hook)
+          value.call(*args)
+        end)
+      end
+    end
+
     def process_client(*)
       UnicornWrangler.perform_request { super }
     end

data/lib/unicorn_wrangler/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn_wrangler
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it
@@ -39,7 +39,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: 'Unicorn: out of band GC / restart on max memory bloat / restart after X