update logging system to match log-contextual router changes

[scpubgit/Object-Remote.git] / lib / Object / Remote / Role / LogForwarder.pm

diff --git a/lib/Object/Remote/Role/LogForwarder.pm b/lib/Object/Remote/Role/LogForwarder.pm
index 1ff8e5f..5c2aecd 100644 (file)
--- a/lib/Object/Remote/Role/LogForwarder.pm
+++ b/lib/Object/Remote/Role/LogForwarder.pm
@@ -4,13 +4,22 @@ use Moo::Role;
 
 has enable_forward => ( is => 'rw', default => sub { 1 } );
 has _forward_destination => ( is => 'rw' );
+#lookup table for package names that should not
+#be forwarded across Object::Remote connections
 has _forward_stop => ( is => 'ro', required => 1, default => sub { {} } );
 
 after _deliver_message => sub {
-  my ($self, $level, $generator, $args, $metadata) = @_;
-  my $package = $metadata->{package};
+#  my ($self, $level, $generator, $args, $metadata) = @_;
+  my ($self, %message_info) = @_;
+  my $package = $message_info{caller_package};
   my $destination = $self->_forward_destination;
   our $reentrant;
+  
+  if (defined $message_info{object_remote}) {
+    $message_info{object_remote} = { %{$message_info{object_remote}} };
+  }
+  
+  $message_info{object_remote}->{forwarded} = 1;
 
   return unless $self->enable_forward;
   return unless defined $destination;
@@ -23,7 +32,11 @@ after _deliver_message => sub {
   
   local $reentrant = $package;
   
-  $destination->_deliver_message($level, $generator, $args, $metadata);
+  eval { $destination->_deliver_message(%message_info) };
+  
+  if ($@ && $@ !~ /^Attempt to use Object::Remote::Proxy backed by an invalid handle/) {
+    die $@;
+  }
 };
 
 sub exclude_forwarding {