about summary refs log tree commit homepage
path: root/lib/rainbows/revactor.rb
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2009-12-01 22:39:38 -0800
committerEric Wong <normalperson@yhbt.net>2009-12-01 22:39:38 -0800
commitc50b69ddf0f1305bb39ed812d084f59db6dd9897 (patch)
tree4c2146f2fbc6fc00e6ba863cd6bf5e60c9d82840 /lib/rainbows/revactor.rb
parent1269cbb93d26ff938f443e8931e908481374bdc3 (diff)
downloadrainbows-c50b69ddf0f1305bb39ed812d084f59db6dd9897.tar.gz
We now correctly exit!(2) if our master can't kill us.
Diffstat (limited to 'lib/rainbows/revactor.rb')
-rw-r--r--lib/rainbows/revactor.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/rainbows/revactor.rb b/lib/rainbows/revactor.rb
index 125e148..b647d48 100644
--- a/lib/rainbows/revactor.rb
+++ b/lib/rainbows/revactor.rb
@@ -116,9 +116,7 @@ module Rainbows
         end
       end
 
-      Actor.sleep 1 while G.tick
-      expire = Time.now + timeout * 2.0
-      Actor.sleep 1 while nr > 0 && Time.now < expire
+      Actor.sleep 1 while G.tick || nr > 0
       rescue Errno::EMFILE => e
     end