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.pm;h=747341c777355d0c2abe000db1aae6bd5d822b5d;hp=16f0d5236eb0643c855931130cb4342d3ee82865;hb=f1d7083568d3d8322a66f9c1265ef326999c5a23;hpb=8ba4f2e3adb9a1fda64b463b34a4306c9034359a

diff --git a/lib/Object/Remote/Role/Connector.pm b/lib/Object/Remote/Role/Connector.pm
index 16f0d52..747341c 100644
--- a/lib/Object/Remote/Role/Connector.pm
+++ b/lib/Object/Remote/Role/Connector.pm
@@ -1,15 +1,62 @@
 package Object::Remote::Role::Connector;
 
 use Module::Runtime qw(use_module);
+use Object::Remote::Future;
+use Object::Remote::Logging qw(:log :dlog );
 use Moo::Role;
 
 requires '_open2_for';
 
+has timeout => (is => 'ro', default => sub { 10 });
+
 sub connect {
   my $self = shift;
-  my %args;
-  @args{qw(send_to_fh receive_from_fh child_pid)} = $self->_open2_for(@_);
-  return use_module('Object::Remote::Connection')->new(\%args);
+  Dlog_debug { "Preparing to create connection with args of: $_" } @_;
+  my ($send_to_fh, $receive_from_fh, $child_pid) = $self->_open2_for(@_);
+  my $channel = use_module('Object::Remote::ReadChannel')->new(
+    fh => $receive_from_fh
+  );
+  return future {
+    log_trace { "Initializing connection for child pid '$child_pid'" };
+    my $f = shift;
+    $channel->on_line_call(sub {
+      if ($_[0] eq "Shere") {
+        log_trace { "Received 'Shere' from child pid '$child_pid'; setting done handler to create connection" };
+        $f->done(
+          use_module('Object::Remote::Connection')->new(
+            send_to_fh => $send_to_fh,
+            read_channel => $channel,
+            child_pid => $child_pid,
+          )
+        );
+      } else {
+        log_warn { "'Shere' was not found in connection data for child pid '$child_pid'" };
+        $f->fail("Expected Shere from remote but received: $_[0]");
+      }
+      undef($channel);
+    });
+    $channel->on_close_call(sub {
+      log_trace { "Connection has been closed" };
+      $f->fail("Channel closed without seeing Shere: $_[0]");
+      undef($channel);
+    });
+    log_trace { "initialized events on channel for child pid '$child_pid'; creating timeout" };
+    Object::Remote->current_loop
+                  ->watch_time(
+                      after => $self->timeout,
+                      code => sub {
+                        Dlog_trace {"Connection timeout timer has fired for child pid '$child_pid'; is_ready: $_" } $f->is_ready;
+                        unless($f->is_ready) {
+                            log_warn { "Connection with child pid '$child_pid' has timed out" };
+                            $f->fail("Connection timed out") unless $f->is_ready;
+                        }
+                        undef($channel);
+                        
+                      }
+                    );
+    log_trace { "connection for child pid '$child_pid' has been initialized" }; 
+    $f;
+  }
 }
 
 1;