From 0a10915fff80ff90bdef2a905dfdc589e815aefd Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 18 Nov 2015 03:58:05 +0000 Subject: bump to unicorn 5.0.1, use monotonic clock The timeout (mis)feature in unicorn uses the monotonic clock if available. We must follow suit to avoid having our timeout functionality completely broken. --- lib/rainbows/xepoll_thread_pool/client.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/rainbows/xepoll_thread_pool/client.rb') diff --git a/lib/rainbows/xepoll_thread_pool/client.rb b/lib/rainbows/xepoll_thread_pool/client.rb index 001e69d..760bbde 100644 --- a/lib/rainbows/xepoll_thread_pool/client.rb +++ b/lib/rainbows/xepoll_thread_pool/client.rb @@ -46,7 +46,7 @@ module Rainbows::XEpollThreadPool::Client LOCK.synchronize { clients = KATO.keys; KATO.clear } clients.each { |io| io.closed? or io.close } end - @@last_expire = Time.now + @@last_expire = Rainbows.now def kato_set LOCK.synchronize { KATO[self] = @@last_expire } @@ -70,7 +70,7 @@ module Rainbows::XEpollThreadPool::Client end def self.expire - return if ((now = Time.now) - @@last_expire) < 1.0 + return if ((now = Rainbows.now) - @@last_expire) < 1.0 if (ot = KEEPALIVE_TIMEOUT) >= 0 ot = now - ot defer = [] -- cgit v1.2.3-24-ge0c7