fix left over remote object hang bug

[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 495a9c2..1ff8e5f 100644 (file)
--- a/lib/Object/Remote/Role/LogForwarder.pm
+++ b/lib/Object/Remote/Role/LogForwarder.pm
@@ -1,36 +1,35 @@
 package Object::Remote::Role::LogForwarder;
 
-use Moo::Role; 
-
-with 'Log::Contextual::Role::Router';
-
-#TODO re-weaken router references when object::remote
-#weak reference operation is figured out
-
-has child_routers => ( is => 'ro', required => 1, default => sub { {} } );
-has parent_router => ( is => 'rw', );#weak_ref => 1 );
-
-#adds a child router to this router and gives it
-#a friendly display name
-sub add_child_router {
-   my ($self, $description, $router) = @_;
-   $self->child_routers->{$description} = $router;
-   #weaken($self->child_routers->{$class});
-   $router->parent_router($self);
-   return; 
-}
+use Moo::Role;
+
+has enable_forward => ( is => 'rw', default => sub { 1 } );
+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 $destination = $self->_forward_destination;
+  our $reentrant;
+
+  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;
+  }
+  
+  local $reentrant = $package;
+  
+  $destination->_deliver_message($level, $generator, $args, $metadata);
+};
 
-sub remove_child_router {
-   my ($self, $description) = @_;
-   return delete $self->child_routers->{$description};
+sub exclude_forwarding {
+  my ($self, $package) = @_;
+  $package = caller unless defined $package;
+  $self->_forward_stop->{$package} = 1;
 }
 
-after handle_log_message => sub {
-   my ($self, @args) = @_;
-   my $parent = $self->parent_router;
-      
-   return unless defined $parent;
-   $parent->handle_log_message(@args);
-};
-
 1;