diff options
| author | Eric Wong <e@80x24.org> | 2017-03-23 00:06:08 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2017-03-23 00:06:08 +0000 |
| commit | 3acb0d5d2592415e8f415aea37c929a4392142fc (patch) | |
| tree | df201e152873f9fb6e4435a3aca590de593ccde6 /lib/unicorn/worker.rb | |
| parent | 079da35629a507719a7c15324cfba4e9c5a7be4d (diff) | |
| parent | d0afe48696a643a5d7400b3db1d68cfd81e8cd38 (diff) | |
| download | unicorn-3acb0d5d2592415e8f415aea37c929a4392142fc.tar.gz | |
* origin/worker_exec: Don't pass a block for fork when forking workers Add worker_exec configuration option
Diffstat (limited to 'lib/unicorn/worker.rb')
| -rw-r--r-- | lib/unicorn/worker.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/unicorn/worker.rb b/lib/unicorn/worker.rb index e22c1bf..8bbac5e 100644 --- a/lib/unicorn/worker.rb +++ b/lib/unicorn/worker.rb @@ -12,18 +12,19 @@ class Unicorn::Worker # :stopdoc: attr_accessor :nr, :switched attr_reader :to_io # IO.select-compatible + attr_reader :master PER_DROP = Raindrops::PAGE_SIZE / Raindrops::SIZE DROPS = [] - def initialize(nr) + def initialize(nr, pipe=nil) drop_index = nr / PER_DROP @raindrop = DROPS[drop_index] ||= Raindrops.new(PER_DROP) @offset = nr % PER_DROP @raindrop[@offset] = 0 @nr = nr @switched = false - @to_io, @master = Unicorn.pipe + @to_io, @master = pipe || Unicorn.pipe end def atfork_child # :nodoc: |