unicorn-camilo 4.8.2.5.18 → 4.8.2.5.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d89131188c4b2ebc8040753ddd8b1a43009c7d
-  data.tar.gz: 081d48d7998191996e23644826ded65727fd64e5
+  metadata.gz: ac18a698098dba575d5b24cacaf382803444ba2e
+  data.tar.gz: 264d884703b75d5268075e101940a679cbd942bd
 SHA512:
-  metadata.gz: 03c1c09173654a6f689a5ce343d2010e13dd44531c64d86c8bf0e0ce5b0db2d46d0e0379971fb69e84c08b0e6e573e10d8f951ecea11faba5f62590136a23457
-  data.tar.gz: f631ef113217da77ecb203e06a9535e3845c8f5eb211d68c479caebd26a09ece617523a78cffa4e89fd0113628a0c1f0cf021a30abb23bbd163ff6e4d14d4083
+  metadata.gz: 6d8e3d88a38ec6ee914c162833d42ceb1e2ac27a21177c1e01028cd20f2dce80632a174550964eed3a2766f60611b61b48822151bd2cbc98b46cff46f6890d08
+  data.tar.gz: d9eed2eb864965d771478d1bb60466f871789364b0a4ccb9e456bda77de5107ba19b6f14004e8d5c5d5e82b15b80709c7fc368fe44479359fba269ddc71dbf08

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 4.8.2.7.g6a7d.dirty
+GIT_VERSION = 4.8.2.7.ge529

data/lib/unicorn/configurator.rb

@@ -180,18 +180,19 @@ class Unicorn::Configurator
     set_hook_arg = if block_given?
       # This hook is meant a an instrumentation point, it should not prevent the
       # worker from getting killed exception will be logged and move on
-      new_block = Proc.new do |*args|
+      new_block = Proc.new do |server, worker, wpid|
         begin
-          block.call(*args)
-        rescue e
-          logger.error("Error trying to run before murder exception: #{e.name}")
+          block.call(server, worker, wpid)
+        rescue StandardError => e
+          server.logger.error("Error executing before murder for PID: #{wpid} error: #{e.inspect}")
+          server.logger.error(e.backtrace.join("\n"))
         end
       end
     else
       args[0]
     end
 
-    set_hook(:before_murder, set_hook_arg, 1)
+    set_hook(:before_murder, set_hook_arg, 3)
   end
 
   # sets the timeout of worker processes to +seconds+.  Workers

data/lib/unicorn/http_server.rb

@@ -490,7 +490,7 @@ class Unicorn::HttpServer
       next_sleep = 0
       logger.error "worker=#{worker.nr} PID:#{wpid} timeout " \
                    "(#{diff}s > #{@timeout}s), killing"
-      before_murder.call(wpid) if before_murder
+      before_murder.call(self, worker, wpid) if before_murder
       kill_worker(:KILL, wpid) # take no prisoners for timeout violations
     end
     next_sleep <= 0 ? 1 : next_sleep

data/lib/unicorn/version.rb

@@ -1 +1 @@
-Unicorn::Const::UNICORN_VERSION = '4.8.2.7.g6a7d.dirty'
+Unicorn::Const::UNICORN_VERSION = '4.8.2.7.ge529'

data/unicorn.gemspec

@@ -14,7 +14,7 @@ end.compact
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn-camilo}
-  s.version = "4.8.2.5.18"
+  s.version = "4.8.2.5.19"
   s.authors = ["#{name} hackers"]
   s.summary = summary
   s.date = Time.now.utc.strftime('%Y-%m-%d')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-camilo
 version: !ruby/object:Gem::Version
-  version: 4.8.2.5.18
+  version: 4.8.2.5.19
 platform: ruby
 authors:
 - Unicorn hackers