X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FWatchDog.pm;h=3b80f85f90f9711230807b623dd9c67f7508f88f;hb=de9062cfef7f98d0efc01b114328959f2f84ada4;hp=2a3fc6160e82ac089339c6e4227a270f2de030e7;hpb=c824fdf36c659b3b6dbafe23a3021f2b1d6eeb3f;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/WatchDog.pm b/lib/Object/Remote/WatchDog.pm
index 2a3fc61..3b80f85 100644
--- a/lib/Object/Remote/WatchDog.pm
+++ b/lib/Object/Remote/WatchDog.pm
@@ -1,46 +1,47 @@
-package Object::Remote::WatchDog; 
+package Object::Remote::WatchDog;
 
-use Object::Remote::MiniLoop; 
-use Object::Remote::Logging qw ( :log :dlog );
-use Moo; 
-
-BEGIN { 
-  $SIG{ALRM} = sub {
-    #if the Watchdog is killing the process we don't want any chance of the
-    #process not actually exiting and die could be caught by an eval which
-    #doesn't do us any good 
-    log_error { sprintf("Watchdog has expired, terminating the process at file %s line %s", __FILE__, __LINE__ + 1); };
-    exit(1);     
-  };   
-};
+use Object::Remote::MiniLoop;
+use Object::Remote::Logging qw (:log :dlog router);
+use Moo;
 
 has timeout => ( is => 'ro', required => 1 );
 
+BEGIN { router()->exclude_forwarding; }
+
 around new => sub {
-  my ($orig, $self, @args) = @_; 
+  my ($orig, $self, @args) = @_;
   our ($WATCHDOG);
-    
+
   return $WATCHDOG if defined $WATCHDOG;
   log_trace { "Constructing new instance of global watchdog" };
-  return $WATCHDOG = $self->$orig(@args);    
+  return $WATCHDOG = $self->$orig(@args);
 };
 
 #start the watchdog
 sub BUILD {
   my ($self) = @_;
+
+  $SIG{ALRM} = sub {
+    #if the Watchdog is killing the process we don't want any chance of the
+    #process not actually exiting and die could be caught by an eval which
+    #doesn't do us any good
+    log_fatal { "Watchdog has expired, terminating the process" };
+    exit(1);
+  };
+
   Dlog_debug { "Initializing watchdog with timeout of $_ seconds" } $self->timeout;
   alarm($self->timeout);
 }
 
 #invoke at least once per timeout to stop
-#the watchdog from killing the process 
+#the watchdog from killing the process
 sub reset {
   our ($WATCHDOG);
   die "Attempt to reset the watchdog before it was constructed"
-    unless defined $WATCHDOG; 
-  
-  log_trace { "Watchdog has been reset" };
-  alarm($WATCHDOG->timeout); 
+    unless defined $WATCHDOG;
+
+  log_debug { "Watchdog has been reset" };
+  alarm($WATCHDOG->timeout);
 }
 
 #must explicitly call this method to stop the
@@ -49,7 +50,8 @@ sub reset {
 #it makes sense to still terminate the process
 sub shutdown {
   my ($self) = @_;
-  alarm(0); 
+  log_debug { "Watchdog is shutting down" };
+  alarm(0);
 }
 
 1;