fix bug that allowed forwarded logs to be output from the logger built via env vars

[scpubgit/Object-Remote.git] / lib / Object / Remote / Logging.pm

diff --git a/lib/Object/Remote/Logging.pm b/lib/Object/Remote/Logging.pm
index 58ccfb0..7eee65f 100644 (file)
--- a/lib/Object/Remote/Logging.pm
+++ b/lib/Object/Remote/Logging.pm
@@ -79,17 +79,12 @@ sub init_logging {
   
   if ($test_logging) {
     require Object::Remote::Logging::TestLogger;
-    router->connect(Object::Remote::Logging::TestOutput->new(
+    router->connect(Object::Remote::Logging::TestLogger->new(
       min_level => 'trace', max_level => 'error',
       level_names => Object::Remote::Logging->arg_levels(),
     ));
   }
 
-  return unless defined $level && $level ne '';
-  $format = "[%l %r] %s" unless defined $format;
-  $selections = __PACKAGE__ unless defined $selections;
-  %controller_should_log = _parse_selections($selections);
-
   {
     no warnings 'once';
     if (defined $Object::Remote::FatNode::REMOTE_NODE) {
@@ -99,6 +94,12 @@ sub init_logging {
     } 
   }
 
+  return unless defined $level && $level ne '';
+  
+  $format = "[%l %r] %s" unless defined $format;
+  $selections = __PACKAGE__ unless defined $selections;
+  %controller_should_log = _parse_selections($selections);
+
   my $logger = Object::Remote::Logging::Logger->new(
     min_level => lc($level), format => $format,
     level_names => Object::Remote::Logging::arg_levels(),
@@ -113,7 +114,7 @@ sub init_logging {
     return unless $will_log;
     #skip things from remote hosts because they log to STDERR
     #when OBJECT_REMOTE_LOG_LEVEL is in effect
-    return if $_[1]->{remote}->{connection_id};
+    return if $_[1]->{remote}->{object_remote};
     $logger
   });
 }