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=cad257257761787e7bd952ddc3bc3dd2b1607b4b;hp=4a4f4afe0cb94e85e91de87f315c2a905a96b957;hb=5add5e29851e82862e4d8f6d67dfce559f6685ce;hpb=5d59cb9859e004df5cde5d83aa7230e621a28b95

diff --git a/lib/Object/Remote/Role/LogForwarder.pm b/lib/Object/Remote/Role/LogForwarder.pm
index 4a4f4af..cad2572 100644
--- a/lib/Object/Remote/Role/LogForwarder.pm
+++ b/lib/Object/Remote/Role/LogForwarder.pm
@@ -1,59 +1,39 @@
 package Object::Remote::Role::LogForwarder;
 
-use Moo::Role; 
-use Object::Remote::Logging; 
-use Scalar::Util qw(weaken);
-use Carp qw(cluck);
+use Moo::Role;
 
-with 'Log::Contextual::Role::Router';
+has enable_forward => ( is => 'rw', default => sub { 1 } );
+has _forward_destination => ( is => 'rw' );
+has _forward_stop => ( is => 'ro', required => 1, default => sub { {} } );
 
-#TODO re-weaken router references when object::remote
-#weak reference operation is figured out
+after _deliver_message => sub {
+  my ($self, $level, $generator, $args, $metadata) = @_;
+  my $package = $metadata->{package};
+  my $destination = $self->_forward_destination;
+  our $reentrant;
 
-has child_routers => ( is => 'ro', required => 1, default => sub { [] } );
-has parent_router => ( is => 'rw', );#weak_ref => 1 );
+  return unless $self->enable_forward;
+  return unless defined $destination;
+  return if $self->_forward_stop->{$package};
 
-sub BUILD { }
-
-after BUILD => sub {
-  my ($self) = @_; 
-#  my $parent = $self->parent_router; 
-#  return unless defined $parent ; 
-#  $parent->add_child_router($self);
-};
-
-sub describe {
-  my ($self, $depth) = @_; 
-  $depth = -1 unless defined $depth; 
-  $depth++;
-  my $buf = "\t" x $depth . $self->description . "\n";
-  foreach my $child (@{$self->child_routers}) {
-      next unless defined $child; 
-      $buf .= $child->describe($depth);
+  if (defined $reentrant) {
+    warn "log forwarding went reentrant. bottom: '$reentrant' top: '$package'";
+    return;
   }
-    
-  return $buf; 
-}
+  
+  local $reentrant = $package;
+  
+  eval { $destination->_deliver_message($level, $generator, $args, $metadata) };
+  
+  if ($@ && $@ !~ /^Attempt to use Object::Remote::Proxy backed by an invalid handle/) {
+    die $@;
+  }
+};
 
-sub add_child_router {
-  my ($self, $router) = @_;
-  push(@{ $self->child_routers }, $router);
-#   weaken(${ $self->child_routers }[-1]);
-  return; 
+sub exclude_forwarding {
+  my ($self, $package) = @_;
+  $package = caller unless defined $package;
+  $self->_forward_stop->{$package} = 1;
 }
 
-#sub remove_child_router {
-#   my ($self, $description) = @_;
-#   return delete $self->child_routers->{$description};
-#}
-
-after handle_log_message => sub {
-  my ($self, @args) = @_;
-  my $parent = $self->parent_router;
-      
-  return unless defined $parent;
-  $parent->handle_log_message(@args);
-};
-
 1;
-