X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FLogging%2FRouter.pm;h=84a562fad483526b84e56e510526df2317fb4947;hp=d8579e3893a55a99239a14eb600b87f142aa8925;hb=052976d4a389b826a9551909492f3fc2f2312c88;hpb=4e4463355a9ec6afdc7983ee36daa9f11306d4fc

diff --git a/lib/Object/Remote/Logging/Router.pm b/lib/Object/Remote/Logging/Router.pm
index d8579e3..84a562f 100644
--- a/lib/Object/Remote/Logging/Router.pm
+++ b/lib/Object/Remote/Logging/Router.pm
@@ -1,82 +1,121 @@
 package Object::Remote::Logging::Router;
 
 use Moo;
+use Scalar::Util qw(weaken);
+use Sys::Hostname;
 
 with 'Log::Contextual::Role::Router';
 with 'Object::Remote::Role::LogForwarder';
 
-has _controller_package => ( is => 'rwp' );
-#lookup table for package names that should not
-#be forwarded across Object::Remote connections
 has _connections => ( is => 'ro', required => 1, default => sub { [] } );
 has _remote_metadata => ( is => 'rw' );
 
 sub before_import {
-    my ($self, $controller, $importer, $spec) = @_;
+  my ($self, $controller, $importer, $spec) = @_;
 }
 
 sub after_import { }
 
 sub _get_loggers {
-    my ($self, %metadata) = @_;
-    my $package = $metadata{package};
-    my $level = $metadata{level};
-    my $is_level = "is_$level";
-    my $need_clean = 0;
-    my @loggers;
-    
-    foreach my $selector (@{$self->_connections}) {
-        unless(defined $selector) {
-            $need_clean = 1;
-            next;
-        }
-        
-        foreach my $logger ($selector->($package, { %metadata })) {
-            next unless defined $logger;
-            next unless $logger->$is_level;
-            push(@loggers, $logger);
-        }
+  my ($self, %metadata) = @_;
+  my $package = $metadata{package};
+  my $level = $metadata{level};
+  my $is_level = "is_$level";
+  my $need_clean = 0;
+  my @loggers;
+
+  foreach my $selector (@{$self->_connections}) {
+    unless(defined $selector) {
+      $need_clean = 1;
+      next;
+    }
+
+    foreach my $logger ($selector->($package, { %metadata })) {
+      next unless defined $logger;
+      next unless $logger->$is_level;
+      push(@loggers, $logger);
     }
+  }
+
+  $self->_clean_connections if $need_clean;
+
+  return @loggers; 
+}
+
+#overloadable so a router can invoke a logger
+#in a different way
+sub _invoke_logger {
+  my ($self, $logger, $level_name, $content, $metadata) = @_;
+  #Invoking the logger like this gets all available data to the
+  #logging object with out losing any information from the datastructure.
+  #This is not a backwards compatible way to invoke the loggers
+  #but it enables a lot of flexibility in the logger.
+  #The l-c router could have this method invoke the logger in
+  #a backwards compatible way and router sub classes invoke
+  #it in non-backwards compatible ways if desired
+  $logger->$level_name($content, $metadata);
+}
 
-    $self->_clean_connections if $need_clean;
-    
-    return @loggers; 
+#overloadable so forwarding can have the updated
+#metadata but does not have to wrap get_loggers
+#which has too many drawbacks
+sub _deliver_message {
+  my ($self, $level, $generator, $args, $metadata) = @_;
+  my @loggers = $self->_get_loggers(%$metadata);
+  
+  return unless @loggers > 0;
+  #this is the point where the user provided log message
+  #code block is executed
+  my @content = $generator->(@$args);
+  foreach my $logger (@loggers) {
+    $self->_invoke_logger($logger, $level, \@content, $metadata);
+  }
 }
 
 sub handle_log_request {
-    my ($self, $metadata_in, $generator, @args) = @_;
-    my %metadata = %{$metadata_in};
-    my $level = $metadata{level};
-    my $package = $metadata{package};
-    my $need_clean = 0;
-
-    #caller_level is useless when log forwarding is in place
-    #so we won't tempt people with using it for now - access
-    #to caller level will be available in the future
-    delete $metadata{caller_level};
-    $metadata{object_remote} = $self->_remote_metadata;
-    
-    foreach my $logger ($self->_get_loggers(%metadata)) {
-        $logger->$level([ $generator->(@args) ], \%metadata);
-    }
+  my ($self, $metadata_in, $generator, @args) = @_;
+  my %metadata = %{$metadata_in};
+  my $level = $metadata{level};
+  my $package = $metadata{package};
+  my $need_clean = 0;
+
+  #caller_level is useless when log forwarding is in place
+  #so we won't tempt people with using it for now - access
+  #to caller level will be available in the future
+  my $caller_level = delete $metadata{caller_level};
+  $metadata{object_remote} = $self->_remote_metadata;
+  $metadata{timestamp} = time;
+  $metadata{pid} = $$;
+  $metadata{hostname} = hostname;
+
+  my @caller_info = caller($caller_level);
+  $metadata{filename} = $caller_info[1];
+  $metadata{line} = $caller_info[2];
+ 
+  @caller_info = caller($caller_level + 1);
+  $metadata{method} = $caller_info[3];
+  $metadata{method} =~ s/^${package}::// if defined $metadata{method};
+
+  $self->_deliver_message($level, $generator, [ @args ], \%metadata);
 }
 
 sub connect {
-    my ($self, $destination) = @_;
-    my $wrapped; 
-        
-    if (ref($destination) ne 'CODE') {
-        $wrapped = sub { $destination };
-    } else {
-        $wrapped = $destination;
-    }
-    
-    push(@{$self->_connections}, $wrapped);
+  my ($self, $destination, $is_weak) = @_;
+  my $wrapped; 
+
+  if (ref($destination) ne 'CODE') {
+    $wrapped = sub { $destination };
+  } else {
+    $wrapped = $destination;
+  }
+
+  push(@{$self->_connections}, $wrapped);
+  weaken($self->_connections->[-1]) if $is_weak;
 }
 
 sub _clean_connections {
-    my ($self) = @_;
-    @{$self->{_connections}} = grep { defined } @{$self->{_connections}};
+  my ($self) = @_;
+  @{$self->{_connections}} = grep { defined } @{$self->{_connections}};
 }
 
 1;