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=7eee65f12e4f3eb228bf3b699dafb4167ccaba24;hp=6e74019d3b17c879fe5c4a0e7d2e7cefca3cf388;hb=a577b9530c7c091e6800bca9dca4fd03c37ce039;hpb=8c3529062a426181861d58ee59fb8f10e0be68e5

diff --git a/lib/Object/Remote/Logging.pm b/lib/Object/Remote/Logging.pm
index 6e74019..7eee65f 100644
--- a/lib/Object/Remote/Logging.pm
+++ b/lib/Object/Remote/Logging.pm
@@ -85,11 +85,6 @@ 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);
-
   {
     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
   });
 }