make --local implementation saner

[scpubgit/Tak.git] / lib / Tak / ConnectorService.pm

diff --git a/lib/Tak/ConnectorService.pm b/lib/Tak/ConnectorService.pm
index 2fb1eaf..15e39bf 100644 (file)
--- a/lib/Tak/ConnectorService.pm
+++ b/lib/Tak/ConnectorService.pm
@@ -6,6 +6,7 @@ use Tak::Router;
 use Tak::Client;
 use Tak::ConnectionService;
 use Net::OpenSSH;
+use Tak::STDIONode;
 use Moo;
 
 with 'Tak::Role::Service';
@@ -15,9 +16,17 @@ has connections => (is => 'ro', default => sub { Tak::Router->new });
 has ssh => (is => 'ro', default => sub { {} });
 
 sub handle_create {
-  my ($self, $on) = @_;
-  my ($kid_in, $kid_out, $kid_pid) = $self->_open($on);
-  $kid_in->print(io('maint/mk-fat |')->all, "__END__\n");
+  my ($self, $on, %args) = @_;
+  die [ mistake => "No target supplied to create" ] unless $on;
+  my $log_level = $args{log_level}||'info';
+  my ($kid_in, $kid_out, $kid_pid) = $self->_open($on, $log_level);
+  $kid_in->print($Tak::STDIONode::DATA, "__END__\n") unless $on eq '-';
+  # Need to get a handshake to indicate STDIOSetup has finished
+  # messing around with file descriptors, otherwise we can severely
+  # confuse things by sending before the dup.
+  my $up = <$kid_out>;
+  die [ failure => "Garbled response from child: $up" ]
+    unless $up eq "Ssyshere\n";
   my $connection = Tak::ConnectionService->new(
     read_fh => $kid_out, write_fh => $kid_in,
     listening_service => Tak::Router->new
@@ -26,7 +35,7 @@ sub handle_create {
   # actually, we should register with a monotonic id and
   # stash the pid elsewhere. but meh for now.
   my $pid = $client->do(meta => 'pid');
-  my $name = ($on||'|').':'.$pid;
+  my $name = $on.':'.$pid;
   my $conn_router = Tak::Router->new;
   $conn_router->register(local => $connection->receiver->service);
   $conn_router->register(remote => $connection);
@@ -35,16 +44,16 @@ sub handle_create {
 }
 
 sub _open {
-  my ($self, $on) = @_;
-  unless ($on) {
-    my $kid_pid = IPC::Open2::open2(my $kid_out, my $kid_in, $^X, '-')
+  my ($self, $on, @args) = @_;
+  if ($on eq '-') {
+    my $kid_pid = IPC::Open2::open2(my $kid_out, my $kid_in, 'tak-stdio-node', '-', @args)
       or die "Couldn't open2 child: $!";
     return ($kid_in, $kid_out, $kid_pid);
   }
   my $ssh = $self->ssh->{$on} ||= Net::OpenSSH->new($on);
   $ssh->error and
     die "Couldn't establish ssh connection: ".$ssh->error;
-  return $ssh->open2('perl','-');
+  return $ssh->open2('perl','-', $on, @args);
 }
 
 sub start_connection_request {