X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FRole%2FConnector%2FPerlInterpreter.pm;h=0964863b82024bf519f5e308e196ad45bdbf0aa3;hp=79f26607952f640f6efbf2d39fda3edb511cb5e5;hb=173c4fd41ad64aaa8e5f3af1596612f6a6b5ee81;hpb=8faf2a289aa3409e7cafe2536f943fb43033b086

diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 79f2660..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 get_router );
+use Object::Remote::Logging qw(:log :dlog router);
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
 use Object::Remote::Future;
@@ -14,15 +13,19 @@ use Moo::Role;
 with 'Object::Remote::Role::Connector';
 
 has module_sender => (is => 'lazy');
-has ulimit => ( is => 'ro' );
-has nice => ( is => 'ro' );
-has watchdog_timeout => ( is => 'ro', required => 1, default => sub { undef } );
+has ulimit => ( is => 'ro');
+has nice => ( is => 'ro');
+has watchdog_timeout => ( is => 'ro', required => 1, default => sub { undef });
 has perl_command => (is => 'lazy');
+has pid => (is => 'rwp');
+has connection_id => (is => 'rwp');
 
 #if no child_stderr file handle is specified then stderr
 #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') }
@@ -31,22 +34,28 @@ sub _build_module_sender {
 }
 
 sub _build_perl_command {
-    my ($self) = @_; 
-    my $nice = $self->nice;
-    my $ulimit = $self->ulimit;
-    my $shell_code = '';  
-    
-    if (defined($ulimit)) {
-        $shell_code .= "ulimit -v $ulimit; ";
-    }
-    
-    if (defined($nice)) {
-        $shell_code .= "nice -n $nice ";
-    }
-    
-    $shell_code .= 'perl -';
-        
-    return [ 'sh', '-c', $shell_code ];        
+  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; ";
+  }
+
+  if (defined($nice)) {
+    $shell_code .= "nice -n $nice ";
+  }
+
+  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 ];
 }
 
 around connect => sub {
@@ -55,9 +64,9 @@ around connect => sub {
   return future {
     $f->on_done(sub {
       my ($conn) = $f->get;
-      $self->_setup_watchdog_reset($conn); 
-      my $sub = $conn->remote_sub('Object::Remote::Logging::init_logging_forwarding');
-      $sub->('Object::Remote::Logging', router => get_router, connection_id => $conn->_id);
+      $self->_setup_watchdog_reset($conn);
+      my $sub = $conn->remote_sub('Object::Remote::Logging::init_remote_logging');
+      $sub->('Object::Remote::Logging', router => router(), connection_id => $conn->_id);
       Object::Remote::Handle->new(
         connection => $conn,
         class => 'Object::Remote::ModuleLoader',
@@ -77,7 +86,9 @@ sub _start_perl {
   my $given_stderr = $self->stderr;
   my $foreign_stderr;
  
-  Dlog_debug { "invoking connection to perl interpreter using command line: $_" } @{$self->final_perl_command};
+  Dlog_verbose {
+    s/\n/ /g; "invoking connection to perl interpreter using command line: $_"
+  } @{$self->final_perl_command};
     
   if (defined($given_stderr)) {
     #if the stderr data goes to an existing file handle
@@ -99,6 +110,8 @@ sub _start_perl {
     @{$self->final_perl_command},
   ) or die "Failed to run perl at '$_[0]': $!";
   
+  $self->_set_pid($pid);
+  
   if (defined($given_stderr)) {   
     Dlog_debug { "Child process STDERR is being handled via run loop" };
         
@@ -130,7 +143,7 @@ sub _open2_for {
   my $self = shift;
   my ($foreign_stdin, $foreign_stdout, $pid) = $self->_start_perl(@_);
   my $to_send = $self->fatnode_text;
-  log_debug { my $len = length($to_send); "Sending contents of fat node to remote node; size is '$len' characters"  };
+  log_debug { my $len = length($to_send); "Sending contents of fat node to remote node; size is '$len' characters" };
   Object::Remote->current_loop
                 ->watch_io(
                     handle => $foreign_stdin,
@@ -160,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;
     
@@ -170,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 {
@@ -197,11 +221,13 @@ sub fatnode_text {
   }
   
   if (defined($watchdog_timeout)) {
-    $text .= "my \$WATCHDOG_TIMEOUT = $watchdog_timeout;\n";   
+    $text .= "my \$WATCHDOG_TIMEOUT = $watchdog_timeout;\n";
   } else {
     $text .= "my \$WATCHDOG_TIMEOUT = undef;\n";
   }
   
+  $text .= '$Object::Remote::FatNode::REMOTE_NODE = "1";' . "\n";
+  
   $text .= <<'END';
 $INC{'Object/Remote/FatNode.pm'} = __FILE__;
 $Object::Remote::FatNode::DATA = <<'ENDFAT';