unicorn-camilo 4.8.2.5.18 → 4.8.2.5.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 66d89131188c4b2ebc8040753ddd8b1a43009c7d
4
- data.tar.gz: 081d48d7998191996e23644826ded65727fd64e5
3
+ metadata.gz: ac18a698098dba575d5b24cacaf382803444ba2e
4
+ data.tar.gz: 264d884703b75d5268075e101940a679cbd942bd
5
5
  SHA512:
6
- metadata.gz: 03c1c09173654a6f689a5ce343d2010e13dd44531c64d86c8bf0e0ce5b0db2d46d0e0379971fb69e84c08b0e6e573e10d8f951ecea11faba5f62590136a23457
7
- data.tar.gz: f631ef113217da77ecb203e06a9535e3845c8f5eb211d68c479caebd26a09ece617523a78cffa4e89fd0113628a0c1f0cf021a30abb23bbd163ff6e4d14d4083
6
+ metadata.gz: 6d8e3d88a38ec6ee914c162833d42ceb1e2ac27a21177c1e01028cd20f2dce80632a174550964eed3a2766f60611b61b48822151bd2cbc98b46cff46f6890d08
7
+ data.tar.gz: d9eed2eb864965d771478d1bb60466f871789364b0a4ccb9e456bda77de5107ba19b6f14004e8d5c5d5e82b15b80709c7fc368fe44479359fba269ddc71dbf08
data/GIT-VERSION-FILE CHANGED
@@ -1 +1 @@
1
- GIT_VERSION = 4.8.2.7.g6a7d.dirty
1
+ GIT_VERSION = 4.8.2.7.ge529
@@ -180,18 +180,19 @@ class Unicorn::Configurator
180
180
  set_hook_arg = if block_given?
181
181
  # This hook is meant a an instrumentation point, it should not prevent the
182
182
  # worker from getting killed exception will be logged and move on
183
- new_block = Proc.new do |*args|
183
+ new_block = Proc.new do |server, worker, wpid|
184
184
  begin
185
- block.call(*args)
186
- rescue e
187
- logger.error("Error trying to run before murder exception: #{e.name}")
185
+ block.call(server, worker, wpid)
186
+ rescue StandardError => e
187
+ server.logger.error("Error executing before murder for PID: #{wpid} error: #{e.inspect}")
188
+ server.logger.error(e.backtrace.join("\n"))
188
189
  end
189
190
  end
190
191
  else
191
192
  args[0]
192
193
  end
193
194
 
194
- set_hook(:before_murder, set_hook_arg, 1)
195
+ set_hook(:before_murder, set_hook_arg, 3)
195
196
  end
196
197
 
197
198
  # sets the timeout of worker processes to +seconds+. Workers
@@ -490,7 +490,7 @@ class Unicorn::HttpServer
490
490
  next_sleep = 0
491
491
  logger.error "worker=#{worker.nr} PID:#{wpid} timeout " \
492
492
  "(#{diff}s > #{@timeout}s), killing"
493
- before_murder.call(wpid) if before_murder
493
+ before_murder.call(self, worker, wpid) if before_murder
494
494
  kill_worker(:KILL, wpid) # take no prisoners for timeout violations
495
495
  end
496
496
  next_sleep <= 0 ? 1 : next_sleep
@@ -1 +1 @@
1
- Unicorn::Const::UNICORN_VERSION = '4.8.2.7.g6a7d.dirty'
1
+ Unicorn::Const::UNICORN_VERSION = '4.8.2.7.ge529'
data/unicorn.gemspec CHANGED
@@ -14,7 +14,7 @@ end.compact
14
14
 
15
15
  Gem::Specification.new do |s|
16
16
  s.name = %q{unicorn-camilo}
17
- s.version = "4.8.2.5.18"
17
+ s.version = "4.8.2.5.19"
18
18
  s.authors = ["#{name} hackers"]
19
19
  s.summary = summary
20
20
  s.date = Time.now.utc.strftime('%Y-%m-%d')
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: unicorn-camilo
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.8.2.5.18
4
+ version: 4.8.2.5.19
5
5
  platform: ruby
6
6
  authors:
7
7
  - Unicorn hackers