From 89d5aa6894af87e055c118dc68bff340547abf5b Mon Sep 17 00:00:00 2001
From: Eric Wong <normalperson@yhbt.net>
Date: Sun, 11 Oct 2009 02:20:45 -0700
Subject: No need to be halving timeout, already done for us

In Unicorn by HttpServer#init_worker_process
---
 lib/rainbows/thread_pool.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/rainbows/thread_pool.rb')

diff --git a/lib/rainbows/thread_pool.rb b/lib/rainbows/thread_pool.rb
index 033452c..c26f47b 100644
--- a/lib/rainbows/thread_pool.rb
+++ b/lib/rainbows/thread_pool.rb
@@ -28,7 +28,7 @@ module Rainbows
         maintain_thread_count(threads)
         threads.list.each do |thr|
           alive.chmod(m = 0 == m ? 1 : 0)
-          thr.join(timeout / 2.0) and break
+          thr.join(timeout) and break
         end
       end
       join_worker_threads(threads)
@@ -62,7 +62,7 @@ module Rainbows
         begin
           ret = begin
             Thread.current[:t] = Time.now
-            IO.select(LISTENERS, nil, nil, timeout/2.0) or next
+            IO.select(LISTENERS, nil, nil, timeout) or next
           rescue Errno::EINTR
             retry
           rescue Errno::EBADF, TypeError
-- 
cgit v1.2.3-24-ge0c7