X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FWatchDog.pm;h=bbcd1884077f0efc37ca91ddf9109e2d02f2ddec;hb=9a46f6c5479427e967cea4f4ea64b0be7decbd7c;hp=6623e02e26e306c650640b1aeb2754f51045da21;hpb=867e4de52669f99e6478ab39afd9be27f27e04dd;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/WatchDog.pm b/lib/Object/Remote/WatchDog.pm
index 6623e02..bbcd188 100644
--- a/lib/Object/Remote/WatchDog.pm
+++ b/lib/Object/Remote/WatchDog.pm
@@ -1,47 +1,46 @@
-package Object::Remote::WatchDog; 
+package Object::Remote::WatchDog;
 
-use Object::Remote::MiniLoop; 
+use Object::Remote::MiniLoop;
 use Object::Remote::Logging qw (:log :dlog router);
-use Moo; 
+use Moo;
 
 has timeout => ( is => 'ro', required => 1 );
 
 BEGIN { router()->exclude_forwarding; }
 
-around new => sub {
-  my ($orig, $self, @args) = @_; 
-  our ($WATCHDOG);
-    
-  return $WATCHDOG if defined $WATCHDOG;
-  log_trace { "Constructing new instance of global watchdog" };
-  return $WATCHDOG = $self->$orig(@args);
+sub instance {
+  my ($class, @args) = @_;
+
+  return our $WATCHDOG ||= do {
+    log_trace { "Constructing new instance of global watchdog" };
+    $class->new(@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 
+    #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; 
-  
+    unless defined our $WATCHDOG;
+
   log_debug { "Watchdog has been reset" };
-  alarm($WATCHDOG->timeout); 
+  alarm($WATCHDOG->timeout);
 }
 
 #must explicitly call this method to stop the
@@ -51,7 +50,7 @@ sub reset {
 sub shutdown {
   my ($self) = @_;
   log_debug { "Watchdog is shutting down" };
-  alarm(0); 
+  alarm(0);
 }
 
 1;