X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FHandle.pm;h=8e01b85df0c4521aa756c98803351a268a73ca0b;hp=de7a65bd789d17b99eb6495aac3c6c5e4b0d2284;hb=fb258df60473013795325e4607b24239ca9db0fc;hpb=9031635d18e754da303557b656c63ce8e7eb8e77

diff --git a/lib/Object/Remote/Handle.pm b/lib/Object/Remote/Handle.pm
index de7a65b..8e01b85 100644
--- a/lib/Object/Remote/Handle.pm
+++ b/lib/Object/Remote/Handle.pm
@@ -2,17 +2,15 @@ package Object::Remote::Handle;
 
 use Object::Remote::Proxy;
 use Scalar::Util qw(weaken blessed);
-use Object::Remote::Logging qw ( :log );
+use Object::Remote::Logging qw ( :log :dlog router );
 use Object::Remote::Future;
-#must find way to exclude certain log events
-#from being forwarded - log events generated in
-#response to log events cause exploding
-#use Object::Remote::Logging qw(:log);
 use Module::Runtime qw(use_module);
 use Moo;
 
+BEGIN { router()->exclude_forwarding }
+
 has connection => (
-  is => 'ro', required => 1,
+  is => 'ro', required => 1, handles => ['is_valid'],
   coerce => sub {
     blessed($_[0])
       ? $_[0]
@@ -32,9 +30,9 @@ sub proxy {
 
 sub BUILD {
   my ($self, $args) = @_;
-  log_debug { "constructing remote handle" };
+  log_trace { "constructing remote handle" };
   if ($self->id) {
-    log_trace { "disaming free for this hanle" };
+    log_trace { "disarming free for this handle" };
     $self->disarm_free;
   } else {
     die "No id supplied and no class either" unless $args->{class};
@@ -49,17 +47,21 @@ sub BUILD {
       )->{remote}->disarm_free->id
     );
   }
-  log_trace { "finished constructing remote handle; registering it" . ref($self) };
+  Dlog_trace { "finished constructing remote handle; id is $_" } $self->id;
   $self->connection->register_remote($self);
 }
 
 sub call {
   my ($self, $method, @args) = @_;
   my $w = wantarray;
-  log_debug { my $def = defined $w; "call() has been invoked on a remote handle; wantarray: '$def'" };
+  my $id = $self->id;
+  
   $method = "start::${method}" if (caller(0)||'') eq 'start';
+  log_trace { "call('$method') has been invoked on remote handle '$id'; creating future" };
+
   future {
-    $self->connection->send(call => $self->id, $w, $method, @args)
+    log_debug { "Invoking send on connection for handle '$id' method '$method'" };
+    $self->connection->send(call => $id, $w, $method, @args)
   };
 }
 
@@ -78,9 +80,13 @@ sub call_discard_free {
 
 sub DEMOLISH {
   my ($self, $gd) = @_;
-  log_trace { "Demolishing remote handle" };
+  Dlog_trace { "Demolishing remote handle $_" } $self->id;
   return if $gd or $self->disarmed_free;
-  $self->connection->send_free($self->id);
+  #this could happen after the connection has gone away
+  eval { $self->connection->send_free($self->id) };
+  if ($@ && $@ !~ m/^Attempt to invoke _send on a connection that is not valid/) {
+    die "Could not invoke send_free on connection for handle " . $self->id;
+  }
 }
 
 1;