unicorn 4.0.0 → 4.0.0.2.g19f7

Sign up to get free protection for your applications and to get access to all the features.
@@ -186,6 +186,8 @@ class Unicorn::Configurator
186
186
  # }
187
187
  def timeout(seconds)
188
188
  set_int(:timeout, seconds, 3)
189
+ max = 0x7fffffff
190
+ set[:timeout] = seconds > max ? max : seconds
189
191
  end
190
192
 
191
193
  # sets the current number of worker_processes to +nr+. Each worker
@@ -453,7 +453,7 @@ class Unicorn::HttpServer
453
453
  def after_fork_internal
454
454
  @ready_pipe.close if @ready_pipe
455
455
  Unicorn::Configurator::RACKUP.clear
456
- @ready_pipe = @init_listeners = @config = @before_exec = @before_fork = nil
456
+ @ready_pipe = @init_listeners = @before_exec = @before_fork = nil
457
457
 
458
458
  srand # http://redmine.ruby-lang.org/issues/4338
459
459
 
@@ -545,6 +545,7 @@ class Unicorn::HttpServer
545
545
  after_fork.call(self, worker) # can drop perms
546
546
  worker.user(*user) if user.kind_of?(Array) && ! worker.switched
547
547
  self.timeout /= 2.0 # halve it for select()
548
+ @config = nil
548
549
  build_app! unless preload_app
549
550
  end
550
551
 
@@ -516,7 +516,7 @@ EOF
516
516
  File.unlink(tmp.path)
517
517
  ucfg = Tempfile.new('unicorn_test_config')
518
518
  ucfg.syswrite("listen '#@addr:#@port'\n")
519
- ucfg.syswrite("before_fork { |s,w|\n")
519
+ ucfg.syswrite("after_fork { |s,w|\n")
520
520
  ucfg.syswrite(" s.listen('#{tmp.path}', :backlog => 5, :sndbuf => 8192)\n")
521
521
  ucfg.syswrite(" s.listen('#@addr:#{port2}', :rcvbuf => 8192)\n")
522
522
  ucfg.syswrite("\n}\n")
metadata CHANGED
@@ -1,13 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: unicorn
3
3
  version: !ruby/object:Gem::Version
4
- hash: 63
5
- prerelease:
4
+ hash: 4001
5
+ prerelease: 8
6
6
  segments:
7
7
  - 4
8
8
  - 0
9
9
  - 0
10
- version: 4.0.0
10
+ - 2
11
+ - g
12
+ - 19
13
+ - f
14
+ - 7
15
+ version: 4.0.0.2.g19f7
11
16
  platform: ruby
12
17
  authors:
13
18
  - Unicorn hackers
@@ -15,7 +20,7 @@ autorequire:
15
20
  bindir: bin
16
21
  cert_chain: []
17
22
 
18
- date: 2011-06-27 00:00:00 Z
23
+ date: 2011-06-29 00:00:00 Z
19
24
  dependencies:
20
25
  - !ruby/object:Gem::Dependency
21
26
  name: rack
@@ -414,12 +419,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
414
419
  required_rubygems_version: !ruby/object:Gem::Requirement
415
420
  none: false
416
421
  requirements:
417
- - - ">="
422
+ - - ">"
418
423
  - !ruby/object:Gem::Version
419
- hash: 3
424
+ hash: 25
420
425
  segments:
421
- - 0
422
- version: "0"
426
+ - 1
427
+ - 3
428
+ - 1
429
+ version: 1.3.1
423
430
  requirements: []
424
431
 
425
432
  rubyforge_project: mongrel