X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FRole%2FConnector%2FPerlInterpreter.pm;h=0964863b82024bf519f5e308e196ad45bdbf0aa3;hb=052976d4a389b826a9551909492f3fc2f2312c88;hp=16bf6a6db81405a898f743965266319f3ac5ca1f;hpb=f1d7083568d3d8322a66f9c1265ef326999c5a23;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 16bf6a6..0964863 100644
--- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
+++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
@@ -1,10 +1,9 @@
 package Object::Remote::Role::Connector::PerlInterpreter;
 
-use IPC::Open2;
 use IPC::Open3; 
 use IO::Handle;
 use Symbol; 
-use Object::Remote::Logging qw( :log :dlog router );
+use Object::Remote::Logging qw(:log :dlog router);
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
 use Object::Remote::Future;
@@ -25,6 +24,8 @@ has connection_id => (is => 'rwp');
 #of the child will be connected to stderr of the parent
 has stderr => ( is => 'rw', default => sub { undef } );
 
+BEGIN { router()->exclude_forwarding; }
+
 sub _build_module_sender {
   my ($hook) =
     grep {blessed($_) && $_->isa('Object::Remote::ModuleLoader::Hook') }
@@ -33,28 +34,28 @@ sub _build_module_sender {
 }
 
 sub _build_perl_command {
-    my ($self) = @_;
-    my $nice = $self->nice;
-    my $ulimit = $self->ulimit;
-    my $perl_path = 'perl';
-    my $shell_code = '';
-
-    if (defined($ulimit)) {
-        $shell_code .= "ulimit $ulimit || exit 1; ";
-    }
+  my ($self) = @_;
+  my $nice = $self->nice;
+  my $ulimit = $self->ulimit;
+  my $perl_path = 'perl';
+  my $shell_code = '';
 
-    if (defined($nice)) {
-        $shell_code .= "nice -n $nice ";
-    }
+  if (defined($ulimit)) {
+    $shell_code .= "ulimit $ulimit || exit 1; ";
+  }
 
-    if (defined($ENV{OBJECT_REMOTE_PERL_BIN})) {
-        log_debug { "Using OBJECT_REMOTE_PERL_BIN environment variable as perl path" };
-        $perl_path = $ENV{OBJECT_REMOTE_PERL_BIN};
-    }
+  if (defined($nice)) {
+    $shell_code .= "nice -n $nice ";
+  }
 
-    $shell_code .= $perl_path . ' -';
+  if (defined($ENV{OBJECT_REMOTE_PERL_BIN})) {
+    log_debug { "Using OBJECT_REMOTE_PERL_BIN environment variable as perl path" };
+    $perl_path = $ENV{OBJECT_REMOTE_PERL_BIN};
+  }
+
+  $shell_code .= $perl_path . ' -';
 
-    return [ 'bash', '-c', $shell_code ];
+  return [ 'bash', '-c', $shell_code ];
 }
 
 around connect => sub {
@@ -172,7 +173,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;
     
@@ -182,18 +183,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 {