X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FRole%2FLogForwarder.pm;h=ce5bbc28133749165342b83e24567c89511d0162;hp=a6ba93976cab77cce07d7553db14afd364b99b26;hb=55c0d0209fa9d9265ff178f54ae9fe5fdddef3c1;hpb=c0b2df05c2f912c9ad4fb0642c95334564ca84ec

diff --git a/lib/Object/Remote/Role/LogForwarder.pm b/lib/Object/Remote/Role/LogForwarder.pm
index a6ba939..ce5bbc2 100644
--- a/lib/Object/Remote/Role/LogForwarder.pm
+++ b/lib/Object/Remote/Role/LogForwarder.pm
@@ -1,35 +1,42 @@
 package Object::Remote::Role::LogForwarder;
 
 use Moo::Role;
-use Carp qw(cluck);
 
-has _forward_destination => ( is => 'rw' );
 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 { {} } );
 
-around _get_loggers => sub {
-  my ($orig, $self, %metadata) = @_;
-  my $package = $metadata{package};
-  my %clone = %metadata;
+after _deliver_message => sub {
+#  my ($self, $level, $generator, $args, $metadata) = @_;
+  my ($self, %message_info) = @_;
+  my $package = $message_info{caller_package};
+  my $destination = $self->_forward_destination;
   our $reentrant;
-  
-  return if $reentrant;
-  local($reentrant) = 1; 
-    
-  my @loggers = $orig->($self, %clone);
-
-  if (! $self->enable_forward || $self->_forward_stop->{$package}) {
-    #warn "will not forward log events for '$package'";
-    return @loggers;
+
+  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};
+
+  if (defined $reentrant) {
+    warn "log forwarding went reentrant. bottom: '$reentrant' top: '$package'";
+    return;
   }
-  
-  my $forward_to = $self->_forward_destination;
-  
-  if ($forward_to) {
-    push(@loggers, $forward_to->_get_loggers(%clone));
+
+  local $reentrant = $package;
+
+  eval { $destination->_deliver_message(%message_info) };
+
+  if ($@ && $@ !~ /^Attempt to use Object::Remote::Proxy backed by an invalid handle/) {
+    die $@;
   }
-  
-  return @loggers;
 };
 
 sub exclude_forwarding {