From 1a9a718a3f9a5b582a4a339a9bb9249c2ca392d7 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 6 Nov 2009 19:45:17 -0800 Subject: cleanup worker heartbeat and master deathwatch It turns out neither the EventMachine and Rev classes checked for master death in its heartbeat mechanism. Since we managed to forget the same thing twice, we now have a test case for it and also centralized the code to remove duplication. --- lib/rainbows/thread_spawn.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib/rainbows/thread_spawn.rb') diff --git a/lib/rainbows/thread_spawn.rb b/lib/rainbows/thread_spawn.rb index 39934a6..a3068c9 100644 --- a/lib/rainbows/thread_spawn.rb +++ b/lib/rainbows/thread_spawn.rb @@ -22,21 +22,18 @@ module Rainbows def worker_loop(worker) init_worker_process(worker) threads = ThreadGroup.new - alive = worker.tmp - m = 0 limit = worker_connections begin - G.alive && master_pid == Process.ppid or break ret = begin - alive.chmod(m = 0 == m ? 1 : 0) + G.tick or break IO.select(LISTENERS, nil, nil, 1) or next rescue Errno::EINTR retry rescue Errno::EBADF, TypeError break end - alive.chmod(m = 0 == m ? 1 : 0) + G.tick ret.first.each do |l| # Sleep if we're busy, another less busy worker process may @@ -57,7 +54,7 @@ module Rainbows rescue Object => e listen_loop_error(e) end while true - join_threads(threads.list, worker) + join_threads(threads.list) end end -- cgit v1.2.3-24-ge0c7