X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=fdb2a22d98cb2c349758ac8d429463ae1036729e;hb=1b5b145b0d29afa9dda70a3de0b3546efddb00a0;hp=d963ea65095852eb26925d9f6dca3514a0c3e054;hpb=353556c4b81bcb3a0c3fff934eff5ab2f19733d4;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index d963ea6..fdb2a22 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -5,6 +5,8 @@ use Config;
 use B qw(perlstring);
 
 my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+#used by t/watchdog_fatnode 
+our $INHIBIT_RUN_NODE = 0; 
 
 sub stripspace {
   my ($text) = @_;
@@ -61,9 +63,12 @@ my @after_inc;
 
 my $env_pass = '';
 if (defined($ENV{OBJECT_REMOTE_LOG_LEVEL})) {
-    my $level = $ENV{OBJECT_REMOTE_LOG_LEVEL};
-    return unless $level =~ /^\w+$/;
-    $env_pass = '$ENV{OBJECT_REMOTE_LOG_LEVEL} = "' . $level . "\";\n";
+  my $level = $ENV{OBJECT_REMOTE_LOG_LEVEL};
+  $env_pass .= '$ENV{OBJECT_REMOTE_LOG_LEVEL} = "' . $level . "\";\n";
+}
+if (defined($ENV{OBJECT_REMOTE_LOG_FORMAT})) {
+  my $format = $ENV{OBJECT_REMOTE_LOG_FORMAT};
+  $env_pass .= '$ENV{OBJECT_REMOTE_LOG_FORMAT} = "' . $format . "\";\n";
 }
 
 my $start = stripspace <<'END_START';
@@ -103,7 +108,11 @@ my $end = stripspace <<'END_END';
 
   use strictures 1;
   use Object::Remote::Node;
-  Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);
+  
+  unless ($Object::Remote::FatNode::INHIBIT_RUN_NODE) {
+    Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);    
+  }
+  
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),