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.

1 files changed, 1 insertions, 7 deletions

diff --git a/lib/rainbows/rev/heartbeat.rb b/lib/rainbows/rev/heartbeat.rb
index 755b136..63eb71d 100644
--- a/lib/rainbows/rev/heartbeat.rb
+++ b/lib/rainbows/rev/heartbeat.rb
@@ -11,15 +11,9 @@ module Rainbows
     # will also detect and execute the graceful exit if triggered
     # by SIGQUIT
     class Heartbeat < ::Rev::TimerWatcher
-      # +tmp+ must be a +File+ that responds to +chmod+
-      def initialize(tmp)
-        @m, @tmp = 0, tmp
-        super(1, true)
-      end
 
       def on_timer
-        @tmp.chmod(@m = 0 == @m ? 1 : 0)
-        exit if (! G.alive && G.cur <= 0)
+        exit if (! G.tick && G.cur <= 0)
       end
 
     end