remove old debugging code; fix ::ModuleSender not returning code from ::FromData

[scpubgit/Object-Remote.git] / lib / Object / Remote / Role / Connector / PerlInterpreter.pm

diff --git a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
index 420707f..5406428 100644 (file)
--- a/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
+++ b/lib/Object/Remote/Role/Connector/PerlInterpreter.pm
@@ -16,6 +16,8 @@ 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 perl_command => (is => 'lazy');
 
 #if no child_stderr file handle is specified then stderr
 #of the child will be connected to stderr of the parent
@@ -28,18 +30,11 @@ sub _build_module_sender {
   return $hook ? $hook->sender : Object::Remote::ModuleSender->new;
 }
 
-has perl_command => (is => 'lazy');
-has watchdog_timeout => ( is => 'ro', required => 1, default => sub { 0 } );
-
-#SSH requires the entire remote command to be
-#given as one single argument to the ssh 
-#command line program so this jumps through
-#some hoops
 sub _build_perl_command {
     my ($self) = @_; 
     my $nice = $self->nice;
-    my $ulimit = $self->ulimit; 
-    my $shell_code = 'sh -c "';
+    my $ulimit = $self->ulimit;
+    my $shell_code = '';  
     
     if (defined($ulimit)) {
         $shell_code .= "ulimit -v $ulimit; ";
@@ -49,9 +44,9 @@ sub _build_perl_command {
         $shell_code .= "nice -n $nice ";
     }
     
-    $shell_code .= 'perl -"';
-    
-    return [ $shell_code ];        
+    $shell_code .= 'perl -';
+        
+    return [ 'sh', '-c', $shell_code ];        
 }
 
 around connect => sub {
@@ -203,8 +198,6 @@ sub fatnode_text {
       $text = "my \$WATCHDOG_TIMEOUT = undef;\n";
   }
   
-  $text .= 'BEGIN { $ENV{OBJECT_REMOTE_DEBUG} = 1 }'."\n"
-    if $ENV{OBJECT_REMOTE_DEBUG};
   $text .= <<'END';
 $INC{'Object/Remote/FatNode.pm'} = __FILE__;
 $Object::Remote::FatNode::DATA = <<'ENDFAT';