X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FLogging%2FRouter.pm;h=cd1de379108345965ed3655aaf744f4833bb94f1;hb=4cef6a48c7132caae25207eed7a2105204ef6e61;hp=9ab2b774e85adb16f55108249f4adc32bdcde5b2;hpb=f048e6dfeaefce08546e91cc9d4bf79492d7ca0d;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/Logging/Router.pm b/lib/Object/Remote/Logging/Router.pm
index 9ab2b77..cd1de37 100644
--- a/lib/Object/Remote/Logging/Router.pm
+++ b/lib/Object/Remote/Logging/Router.pm
@@ -7,22 +7,17 @@ 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) = @_;
-}
+sub before_import { }
 
 sub after_import { }
 
 sub _get_loggers {
   my ($self, %metadata) = @_;
-  my $package = $metadata{package};
-  my $level = $metadata{level};
+  my $package = $metadata{caller_package};
+  my $level = $metadata{message_level};
   my $is_level = "is_$level";
   my $need_clean = 0;
   my @loggers;
@@ -42,7 +37,7 @@ sub _get_loggers {
 
   $self->_clean_connections if $need_clean;
 
-  return @loggers; 
+  return @loggers;
 }
 
 #overloadable so a router can invoke a logger
@@ -50,7 +45,7 @@ sub _get_loggers {
 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 structure.
+  #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
@@ -63,48 +58,48 @@ sub _invoke_logger {
 #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);
-  
+  my ($self, %message_info) = @_;
+  my @loggers = $self->_get_loggers(%message_info);
+  my $generator = $message_info{message_sub};
+  my $args = $message_info{message_args};
+  my $level = $message_info{message_level};
+
   return unless @loggers > 0;
-  #this is the point where the user provided log message
-  #code block is executed
+  #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);
+    $self->_invoke_logger($logger, $level, \@content, \%message_info);
   }
 }
 
 sub handle_log_request {
-  my ($self, $metadata_in, $generator, @args) = @_;
-  my %metadata = %{$metadata_in};
-  my $level = $metadata{level};
-  my $package = $metadata{package};
+  my ($self, %message_info) = @_;
+  my $level = $message_info{message_level};
+  my $package = $message_info{caller_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;
+  #so we won't tempt people with using it
+  my $caller_level = delete $message_info{caller_level};
+  $message_info{object_remote} = $self->_remote_metadata;
+  $message_info{timestamp} = time;
+  $message_info{pid} = $$;
+  $message_info{hostname} = hostname;
 
   my @caller_info = caller($caller_level);
-  $metadata{filename} = $caller_info[1];
-  $metadata{line} = $caller_info[2];
- 
+  $message_info{filename} = $caller_info[1];
+  $message_info{line} = $caller_info[2];
+
   @caller_info = caller($caller_level + 1);
-  $metadata{method} = $caller_info[3];
-  $metadata{method} =~ s/^${package}::// if defined $metadata{method};
+  $message_info{method} = $caller_info[3];
+  $message_info{method} =~ s/^${package}::// if defined $message_info{method};
 
-  $self->_deliver_message($level, $generator, [ @args ], \%metadata);
+  $self->_deliver_message(%message_info);
 }
 
 sub connect {
   my ($self, $destination, $is_weak) = @_;
-  my $wrapped; 
+  my $wrapped;
 
   if (ref($destination) ne 'CODE') {
     $wrapped = sub { $destination };