From: Tyler Riddle <t.riddle@shadowcat.co.uk>
Date: Fri, 30 Nov 2012 21:04:48 +0000 (-0800)
Subject: fix futures that need to be failed not being failed when a connection is closed
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=6aaa14ea30962aa1dd381c93184d180fa9f27fff;p=scpubgit%2FObject-Remote.git

fix futures that need to be failed not being failed when a connection is closed
---

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index 8dd6fd9..52aa341 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -121,6 +121,7 @@ sub _fail_outstanding {
   foreach(keys(%$outstanding)) {
     log_trace { "Failing future for $_" };
     my $future = $outstanding->{$_};
+    $future->fail("$error\n");
   }
 
   %$outstanding = ();
diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 0a7ad67..5b67dd8 100644
--- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
+++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
@@ -174,7 +174,7 @@ sub _setup_watchdog_reset {
   my ($self, $conn) = @_;
   my $timer_id; 
     
-  return unless $self->watchdog_timeout; 
+  return unless $self->watchdog_timeout;
         
   Dlog_trace { "Creating Watchdog management timer for connection id $_" } $conn->_id;
     
@@ -184,18 +184,29 @@ sub _setup_watchdog_reset {
     every => $self->watchdog_timeout / 3,
     code => sub {
       unless(defined($conn)) {
-        log_trace { "Weak reference to connection in Watchdog was lost, terminating update timer $timer_id" };
+        log_warn { "Weak reference to connection in Watchdog was lost, terminating update timer $timer_id" };
         Object::Remote->current_loop->unwatch_time($timer_id);
-        return;  
+        return;
       }
-            
+      
+      unless($conn->is_valid) {
+        log_warn { "Watchdog timer found an invalid connection, removing the timer" };
+        Object::Remote->current_loop->unwatch_time($timer_id);
+        return;
+      }
+      
       Dlog_trace { "Reseting Watchdog for connection id $_" } $conn->_id;
       #we do not want to block in the run loop so send the
       #update off and ignore any result, we don't need it
       #anyway
       $conn->send_class_call(0, 'Object::Remote::WatchDog', 'reset');
     }
-  );     
+  );
+  
+  $conn->on_close->on_ready(sub {
+    log_debug { "Removing watchdog for connection that is now closed" };
+    Object::Remote->current_loop->unwatch_time($timer_id);
+  });
 }
 
 sub fatnode_text {
diff --git a/lib/Object/Remote/WatchDog.pm b/lib/Object/Remote/WatchDog.pm
index 7e4d1fe..6623e02 100644
--- a/lib/Object/Remote/WatchDog.pm
+++ b/lib/Object/Remote/WatchDog.pm
@@ -25,8 +25,8 @@ sub BUILD {
     #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);     
+    log_fatal { "Watchdog has expired, terminating the process" };
+    exit(1);
   };   
   
   Dlog_debug { "Initializing watchdog with timeout of $_ seconds" } $self->timeout;