X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FConnection.pm;h=c5bc9f673af6e22e7af162adac9798de1e782f8b;hp=e3cb4527ab5d2a55bae58ae479099f910b62d61a;hb=11dbd4a02cce95ee689233d2b1d2392470518732;hpb=e441f00ec2896d31dae9f06e8735ac8343a16f22

diff --git a/lib/Object/Remote/Connection.pm b/lib/Object/Remote/Connection.pm
index e3cb452..c5bc9f6 100644
--- a/lib/Object/Remote/Connection.pm
+++ b/lib/Object/Remote/Connection.pm
@@ -41,9 +41,15 @@ sub _build_ready_future { CPS::Future->new }
 
 has _receive_data_buffer => (is => 'ro', default => sub { my $x = ''; \$x });
 
-has local_objects_by_id => (is => 'ro', default => sub { {} });
+has local_objects_by_id => (
+  is => 'ro', default => sub { {} },
+  coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
+);
 
-has remote_objects_by_id => (is => 'ro', default => sub { {} });
+has remote_objects_by_id => (
+  is => 'ro', default => sub { {} },
+  coerce => sub { +{ %{$_[0]} } }, # shallow clone on the way in
+);
 
 has outstanding_futures => (is => 'ro', default => sub { {} });
 
@@ -83,6 +89,7 @@ BEGIN {
   eval { require Object::Remote::Connector::Local };
   eval { require Object::Remote::Connector::LocalSudo };
   eval { require Object::Remote::Connector::SSH };
+  eval { require Object::Remote::Connector::UNIX };
 }
 
 sub new_from_spec {
@@ -94,7 +101,7 @@ sub new_from_spec {
   die "Couldn't figure out what to do with ${spec}";
 }
 
-sub new_remote {
+sub remote_object {
   my ($self, @args) = @_;
   Object::Remote::Handle->new(
     connection => $self, @args
@@ -108,7 +115,7 @@ sub connect {
   ));
 }
 
-sub get_remote_sub {
+sub remote_sub {
   my ($self, $sub) = @_;
   my ($pkg, $name) = $sub =~ m/^(.*)::([^:]+)$/;
   return await_future($self->send(class_call => $pkg, 0, can => $name));
@@ -211,7 +218,9 @@ sub _receive_data_from {
   my ($self, $fh) = @_;
   my $rb = $self->_receive_data_buffer;
   my $ready = $self->ready_future->is_ready;
-  if (sysread($fh, $$rb, 1024, length($$rb)) > 0) {
+  my $len = sysread($fh, $$rb, 1024, length($$rb));
+  my $err = defined($len) ? undef : ": $!";
+  if (defined($len) and $len > 0) {
     while ($$rb =~ s/^(.*)\n//) {
       if ($ready) {
         $self->_receive($1);
@@ -229,7 +238,7 @@ sub _receive_data_from {
                       on_read_ready => 1
                     );
     my $outstanding = $self->outstanding_futures;
-    $_->fail("Connection lost") for values %$outstanding;
+    $_->fail("Connection lost${err}") for values %$outstanding;
     %$outstanding = ();
     $self->on_close->done();
   }