X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=scpubgit%2FObject-Remote.git;a=blobdiff_plain;f=lib%2FObject%2FRemote%2FLogging.pm;h=cf85e10f6a7a71362abe80a5ebf12072063ae5ea;hp=1c239a7b556dbdbfd51c434a1fc8ec95defe23ce;hb=fe203cb2d2fd85b7051a55ffbb34c1b9ac1a65a2;hpb=c0b2df05c2f912c9ad4fb0642c95334564ca84ec

diff --git a/lib/Object/Remote/Logging.pm b/lib/Object/Remote/Logging.pm
index 1c239a7..cf85e10 100644
--- a/lib/Object/Remote/Logging.pm
+++ b/lib/Object/Remote/Logging.pm
@@ -3,9 +3,12 @@ package Object::Remote::Logging;
 use Moo;
 use Scalar::Util qw(blessed);
 use Object::Remote::Logging::Logger;
+use Exporter::Declare;
 
 extends 'Log::Contextual';
 
+exports(qw( router arg_levels ));
+
 sub router {
   our $Router_Instance ||= do {
     require Object::Remote::Logging::Router;
@@ -13,22 +16,42 @@ sub router {
   }
 }
 
+#log level descriptions
+#info - standard log level - normal program output for the end user
+#warn - output for program that is executing quietly
+#error - output for program that is running more quietly
+#fatal - it is not possible to continue execution; this level is as quiet as is possible
+#verbose - output for program executing verbosely (-v)
+#debug - output for program running more verbosely (-v -v)
+#trace - output for program running extremely verbosely (-v -v -v)
 sub arg_levels {
-  return [qw( trace debug verbose info warn error )];
+  #the order of the log levels is significant with the
+  #most verbose level being first in the list and the
+  #most quiet as the last item
+  return [qw( trace debug verbose info warn error fatal )];
 }
 
 #this is invoked on all nodes
 sub init_logging {
   my $level = $ENV{OBJECT_REMOTE_LOG_LEVEL};
+  my $format = $ENV{OBJECT_REMOTE_LOG_FORMAT};
+  #TODO allow the selections value to be * so it selects everything
+  my $selections = $ENV{OBJECT_REMOTE_LOG_SELECTIONS};
+  my %controller_should_log;
+  
   return unless defined $level;
+  $format = "[%l %r] %s" unless defined $format;
+  $selections = __PACKAGE__ unless defined $selections;
+  %controller_should_log = map { $_ => 1 } split(' ', $selections);
+  
   my $logger = Object::Remote::Logging::Logger->new(
-    min_level => lc($level),
+    min_level => lc($level), format => $format,
     level_names => Object::Remote::Logging::arg_levels(),
   );
 
-  #TODO check on speed of string compare against a hash with a single key
   router()->connect(sub { 
-    return unless $_[1]->{controller} eq __PACKAGE__;
+    my $controller = $_[1]->{controller};
+    return unless  $controller_should_log{'*'} || $controller_should_log{$controller};
     #skip things from remote hosts because they log to STDERR
     #when OBJECT_REMOTE_LOG_LEVEL is in effect
     return if $_[1]->{remote}->{connection_id};
@@ -42,7 +65,7 @@ sub init_logging_forwarding {
   my ($self, %controller_info) = @_;
   
   router()->_remote_metadata({ connection_id => $controller_info{connection_id} });
-  router()->_forward_destination($controller_info{router});
+  router()->_forward_destination($controller_info{router}) if $ENV{OBJECT_REMOTE_LOG_FORWARDING};
 }
 
 1;