about summary refs log tree commit homepage
diff options
authorEric Wong <normalperson@yhbt.net>2010-10-27 01:44:33 +0000
committerEric Wong <normalperson@yhbt.net>2010-10-27 01:59:30 +0000
commit10037f2aabb3fab4296fc90c615e7caa9f4a9b53 (patch)
parent5a0506c2affd2f5abe6e7315121e67aa3e32b253 (diff)
There is no need to loop in the master_sleep method at all, as
the rest of the code is designed to function even on interrupted

This change is included as part of a larger cleanup in master.
(commit bdc79712e5ac53d39c51e80dfe50aff950e5053f)
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/unicorn.rb b/lib/unicorn.rb
index e2d1ac1..f454eb7 100644
--- a/lib/unicorn.rb
+++ b/lib/unicorn.rb
@@ -488,12 +488,9 @@ module Unicorn
     # wait for a signal hander to wake us up and then consume the pipe
     # Wake up every second anyways to run murder_lazy_workers
     def master_sleep(sec)
-      begin
-        IO.select([ SELF_PIPE.first ], nil, nil, sec) or return
-        SELF_PIPE.first.read_nonblock(Const::CHUNK_SIZE, HttpRequest::BUF)
+      IO.select([ SELF_PIPE[0] ], nil, nil, sec) or return
+      SELF_PIPE[0].read_nonblock(Const::CHUNK_SIZE, HttpRequest::BUF)
       rescue Errno::EAGAIN, Errno::EINTR
-        break
-      end while true
     def awaken_master