unicorn-camilo 4.8.2.5.16 → 4.8.2.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 973aaf53c3fe721fa73b579f187128bc7e491f88
-  data.tar.gz: c6a29a015bcfc20630721265c7aa17958fe28f29
+  metadata.gz: 977f4f9c4d25a78b1b84eb604168414d489ac1c5
+  data.tar.gz: 5b2a267b817876a1a78333301be78a24c1d02a23
 SHA512:
-  metadata.gz: 017b388610cec22ce05575d4a7fc4da23ee0c4632b09ccc86669ff7267c16684ce8dd599b9058203231f85116e659d75172164ff906ce9f90d423024f3beadea
-  data.tar.gz: 69c4e26cf75ea7038dec7ed35f6d235c2b05fe7ccc52a3368b9edf0fcbf3dbaf4c7f7c9f24ef6c70287e0d56a668c8cc5a021fb7403f21309931a78033ff24c1
+  metadata.gz: 7156259613cd2729a25d3d21c49ea7e3d4213798b9a97b33d35e21a6185ecefe00fa0882da72cc583967f28ca1d6960bcb20519d7ab885766ffa6d0f7cd4688d
+  data.tar.gz: ba09f8497bc990b85af49fcd860034c23eca2077821e0c7d7f212c165f6499289eee774f3ebfc6ff2e53e216a7c887f7bc66389d3fe243da1b7d81f0c31d349d

data/lib/unicorn/configurator.rb

@@ -177,7 +177,21 @@ class Unicorn::Configurator
   # with SIGKILL, the point of this callback is NOT to prevent killing
   # but to provide an instrumentation hook
   def before_murder(*args, &block)
-    set_hook(:before_murder, block_given? ? block : args[0], 1)
+    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
+        begin
+          block.call
+        rescue e
+          logger.error("Error trying to run before murder exception: #{e.name}")
+        end
+      end
+    else
+      args[0]
+    end
+
+    set_hook(:before_murder, set_hook_arg, 1)
   end
 
   # sets the timeout of worker processes to +seconds+.  Workers

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.16"
+  s.version = "4.8.2.5.17"
   s.authors = ["#{name} hackers"]
   s.summary = summary
   s.date = Time.now.utc.strftime('%Y-%m-%d')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicorn-camilo
 version: !ruby/object:Gem::Version
-  version: 4.8.2.5.16
+  version: 4.8.2.5.17
 platform: ruby
 authors:
 - Unicorn hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack