unicorn-camilo 4.8.2.5.12 → 4.8.2.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cc3e2c2de85496f57ad151c86e1b0b61ab5061d
-  data.tar.gz: 43cdf6879f840cfeaa5e852d1120bcc187985578
+  metadata.gz: 3cabaff4756154cd6057dd741837244380914404
+  data.tar.gz: 3c956f73f2e2c1e815b37edeeb85874bf96c11c0
 SHA512:
-  metadata.gz: 4d450f24fd825ed26c985d5cbda8c13ae4207f13ab8b5864e64f202d8f48b6d975916978f7cc6023c4e9689b1bb4236df8267b001d26cf11f99c18f3e8958587
-  data.tar.gz: 1b8ae95d83cd32ab917f5c0c491773a1f5208594a7128575a7b072d547af2debeea82c477045c8c80e816177a4e3a37c9459645e35c5988e94c34429d993089a
+  metadata.gz: 5b40f18a1f90527337cb6f67f68bc799a55660acbf0a5708ca1d7de45826742a04447be669aae5107e90e1864e9d90a191de33e783f4cb5df39f200fd7656400
+  data.tar.gz: eba8ca93ee3fdfb7c945e4507e122fb81e9450288e779b4640009819a589b3672f53870ae74ee68a83105e9c950b9834fc0569df4e464b104d7ba2b257922bd3

data/GIT-VERSION-FILE

@@ -1 +1 @@
-GIT_VERSION = 4.8.2.5.g97c3.dirty
+GIT_VERSION = 4.8.2.5.g4091.dirty

data/lib/unicorn/http_server.rb

@@ -16,7 +16,8 @@ class Unicorn::HttpServer
                 :before_fork, :after_fork, :before_exec,
                 :listener_opts, :preload_app,
                 :reexec_pid, :orig_app, :init_listeners,
-                :master_pid, :config, :ready_pipe, :user
+                :master_pid, :config, :ready_pipe, :user,
+                :before_murder
 
   attr_reader :pid, :logger
   include Unicorn::SocketHelper
@@ -489,11 +490,8 @@ class Unicorn::HttpServer
       next_sleep = 0
       logger.error "worker=#{worker.nr} PID:#{wpid} timeout " \
                    "(#{diff}s > #{@timeout}s), killing"
-     kill_worker(:TERM, wpid)
-     fork do
-       sleep(0.5)
-       kill_worker(:KILL, wpid) # take no prisoners for timeout violations
-     end
+      before_murder.call(wpid) if before_murder
+      kill_worker(:KILL, wpid) # take no prisoners for timeout violations
     end
     next_sleep <= 0 ? 1 : next_sleep
   end
@@ -610,7 +608,7 @@ class Unicorn::HttpServer
   def init_worker_process(worker)
     worker.atfork_child
     # we'll re-trap :QUIT later for graceful shutdown iff we accept clients
-    EXIT_SIGS.each { |sig| trap(sig) { STDERR.puts(caller); exit!(0) } }
+    EXIT_SIGS.each { |sig| trap(sig) { exit!(0) } }
     exit!(0) if (SIG_QUEUE & EXIT_SIGS)[0]
     WORKER_QUEUE_SIGS.each { |sig| trap(sig, nil) }
     trap(:CHLD, 'DEFAULT')

data/lib/unicorn/version.rb

@@ -1 +1 @@
-Unicorn::Const::UNICORN_VERSION = '4.8.2.5.g97c3.dirty'
+Unicorn::Const::UNICORN_VERSION = '4.8.2.5.g4091.dirty'

data/unicorn.gemspec

@@ -14,7 +14,7 @@ end.compact
 
 Gem::Specification.new do |s|
   s.name = %q{unicorn-camilo}
-  s.version = ENV["VERSION"].dup
+  s.version = "4.8.2.5.13"
   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.12
+  version: 4.8.2.5.13
 platform: ruby
 authors:
 - Unicorn hackers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -310,7 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongrel
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rack HTTP server for fast clients and Unix