X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FRole%2FConnector%2FPerlInterpreter.pm;h=fd4ab2533d0903914fcf714d699acb956ad915a6;hb=a8ac86b54bc79f9ec659086cc095687fdc020b0d;hp=17945d32338d67605c402b08f333523627820aef;hpb=a9fdb55e205b30cfca1cee5f61ab0f1107f750d1;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 17945d3..fd4ab25 100644
--- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
+++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
@@ -3,32 +3,51 @@ package Object::Remote::Role::Connector::PerlInterpreter;
 use IPC::Open2;
 use Object::Remote::ModuleSender;
 use Object::Remote::Handle;
-use Object::Remote::FatNode;
+use Scalar::Util qw(blessed);
 use Moo::Role;
 
 with 'Object::Remote::Role::Connector';
 
+has module_sender => (is => 'lazy');
+
+sub _build_module_sender {
+  my ($hook) =
+    grep {blessed($_) && $_->isa('Object::Remote::ModuleLoader::Hook') }
+      @INC;
+  return $hook ? $hook->sender : Object::Remote::ModuleSender->new;
+}
+
 around connect => sub {
   my ($orig, $self) = (shift, shift);
   my $conn = $self->$orig(@_);
   Object::Remote::Handle->new(
     connection => $conn,
     class => 'Object::Remote::ModuleLoader',
-    args => { module_sender => Object::Remote::ModuleSender->new }
+    args => { module_sender => $self->module_sender }
   )->disarm_free;
   return $conn;
 };
 
 sub _perl_command { 'perl', '-' }
 
-sub _open2_for {
+sub _start_perl {
   my $self = shift;
   my $pid = open2(
     my $foreign_stdout,
     my $foreign_stdin,
     $self->_perl_command(@_),
   ) or die "Failed to run perl at '$_[0]': $!";
-  print $foreign_stdin $Object::Remote::FatNode::DATA, "__END__\n";
+  return ($foreign_stdin, $foreign_stdout, $pid);
+}
+
+sub _open2_for {
+  my $self = shift;
+  my ($foreign_stdin, $foreign_stdout, $pid) = $self->_start_perl(@_);
+  require Object::Remote::FatNode;
+  print $foreign_stdin 'BEGIN { $ENV{OBJECT_REMOTE_DEBUG} = 1 }'."\n"
+    if $ENV{OBJECT_REMOTE_DEBUG};
+  print $foreign_stdin $Object::Remote::FatNode::DATA, "__END__\n"
+    or die "Failed to send fatpacked data to new node on '$_[0]': $!";
   return ($foreign_stdin, $foreign_stdout, $pid);
 }