cleanup trailing whitespace ugliness

[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 d3968d2..ce5bbc2 100644 (file)
--- a/lib/Object/Remote/Role/LogForwarder.pm
+++ b/lib/Object/Remote/Role/LogForwarder.pm
@@ -9,11 +9,18 @@ has _forward_destination => ( is => 'rw' );
 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;
   return if $self->_forward_stop->{$package};
@@ -22,11 +29,11 @@ after _deliver_message => sub {
     warn "log forwarding went reentrant. bottom: '$reentrant' top: '$package'";
     return;
   }
-  
+
   local $reentrant = $package;
-  
-  eval { $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 $@;
   }