diff options
| author | Eric Wong <e@80x24.org> | 2015-11-18 03:58:05 +0000 |
|---|---|---|
| committer | Eric Wong <e@80x24.org> | 2015-11-21 01:43:29 +0000 |
| commit | 0a10915fff80ff90bdef2a905dfdc589e815aefd (patch) | |
| tree | 8692e5af9d367f57732dc985ba4c3d44af723fa6 /lib/rainbows/join_threads.rb | |
| parent | df169eb21fd571853bd388079d04e86a59298e9c (diff) | |
| download | rainbows-0a10915fff80ff90bdef2a905dfdc589e815aefd.tar.gz | |
The timeout (mis)feature in unicorn uses the monotonic clock if available. We must follow suit to avoid having our timeout functionality completely broken.
Diffstat (limited to 'lib/rainbows/join_threads.rb')
| -rw-r--r-- | lib/rainbows/join_threads.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rainbows/join_threads.rb b/lib/rainbows/join_threads.rb index 7ab2004..2ae6aa4 100644 --- a/lib/rainbows/join_threads.rb +++ b/lib/rainbows/join_threads.rb @@ -5,12 +5,12 @@ module Rainbows::JoinThreads # blocking acceptor threads must be forced to run def self.acceptors(threads) - expire = Time.now + Rainbows.server.timeout + expire = Rainbows.now + Rainbows.server.timeout threads.delete_if do |thr| Rainbows.tick begin # blocking accept() may not wake up properly - thr.raise(Errno::EINTR) if Time.now > expire && thr.stop? + thr.raise(Errno::EINTR) if Rainbows.now > expire && thr.stop? thr.run thr.join(0.01) |