X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FLogging%2FRouter.pm;h=16c9774553112e120c3a84c242209fe6a163a272;hb=1a90d0eeb2ed492e0f7f84e95c67161491d8f79e;hp=1bd62faef0629113f28adae63d893f4b4ffbf36d;hpb=eb49c7df7a88ac9114188e9eeb1480205bea97ee;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Logging/Router.pm b/lib/Object/Remote/Logging/Router.pm
index 1bd62fa..16c9774 100644
--- a/lib/Object/Remote/Logging/Router.pm
+++ b/lib/Object/Remote/Logging/Router.pm
@@ -2,11 +2,11 @@ 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 { [] } );
@@ -34,9 +34,7 @@ sub _get_loggers {
 
     foreach my $logger ($selector->($package, { %metadata })) {
       next unless defined $logger;
-      my $method = $logger->can($is_level);
-      next unless defined $method;
-      next unless $logger->$method;
+      next unless $logger->$is_level;
       push(@loggers, $logger);
     }
   }
@@ -46,6 +44,8 @@ sub _get_loggers {
   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
@@ -58,6 +58,22 @@ sub _invoke_logger {
   $logger->$level_name($content, $metadata);
 }
 
+#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};
@@ -71,6 +87,8 @@ sub handle_log_request {
   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];
@@ -80,9 +98,7 @@ sub handle_log_request {
   $metadata{method} = $caller_info[3];
   $metadata{method} =~ s/^${package}::// if defined $metadata{method};
 
-  foreach my $logger ($self->_get_loggers(%metadata)) {
-    $self->_invoke_logger($logger, $level, [ $generator->(@args) ], \%metadata);
-  }
+  $self->_deliver_message($level, $generator, [ @args ], \%metadata);
 }
 
 sub connect {