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=de7a65bd789d17b99eb6495aac3c6c5e4b0d2284;hp=1a757ab94469073027519c564eac20bba0cddd19;hb=9031635d18e754da303557b656c63ce8e7eb8e77;hpb=676438a11cbf6bd49102369824c9d87f70964fd3

diff --git a/lib/Object/Remote/Handle.pm b/lib/Object/Remote/Handle.pm
index 1a757ab..de7a65b 100644
--- a/lib/Object/Remote/Handle.pm
+++ b/lib/Object/Remote/Handle.pm
@@ -2,7 +2,12 @@ package Object::Remote::Handle;
 
 use Object::Remote::Proxy;
 use Scalar::Util qw(weaken blessed);
+use Object::Remote::Logging qw ( :log );
 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;
 
@@ -27,24 +32,31 @@ sub proxy {
 
 sub BUILD {
   my ($self, $args) = @_;
-  unless ($self->id) {
+  log_debug { "constructing remote handle" };
+  if ($self->id) {
+    log_trace { "disaming free for this hanle" };
+    $self->disarm_free;
+  } else {
     die "No id supplied and no class either" unless $args->{class};
     ref($_) eq 'HASH' and $_ = [ %$_ ] for $args->{args};
+    log_trace { "fetching id for handle and disarming free on remote side" };
     $self->_set_id(
       await_future(
-        $self->connection->send(
-          class_call => $args->{class}, 0,
+        $self->connection->send_class_call(
+          0, $args->{class},
           $args->{constructor}||'new', @{$args->{args}||[]}
         )
       )->{remote}->disarm_free->id
     );
   }
+  log_trace { "finished constructing remote handle; registering it" . ref($self) };
   $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'" };
   $method = "start::${method}" if (caller(0)||'') eq 'start';
   future {
     $self->connection->send(call => $self->id, $w, $method, @args)
@@ -53,17 +65,20 @@ sub call {
 
 sub call_discard {
   my ($self, $method, @args) = @_;
+  log_trace { "invoking send_discard() with 'call' for method '$method' on connection for remote handle" };
   $self->connection->send_discard(call => $self->id, $method, @args);
 }
 
 sub call_discard_free {
   my ($self, $method, @args) = @_;
   $self->disarm_free;
+  log_trace { "invoking send_discard() with 'call_free' for method '$method' on connection for remote handle" };
   $self->connection->send_discard(call_free => $self->id, $method, @args);
 }
 
 sub DEMOLISH {
   my ($self, $gd) = @_;
+  log_trace { "Demolishing remote handle" };
   return if $gd or $self->disarmed_free;
   $self->connection->send_free($self->id);
 }