X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FObject%2FRemote%2FFatNode.pm;h=77e692837bc34a89e8f62e2cdeeaf1c152a85084;hb=466ee2c442ee6958e077a02c3c250245f06ad819;hp=0d10bb98871d4f9f87f5317f659d65e497792ffb;hpb=f6ac59278cf0c86dc81d2da43e18b592ff2200f2;p=scpubgit%2FObject-Remote.git

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 0d10bb9..77e6928 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) = @_;
@@ -55,9 +57,26 @@ sub filter_not_core {
   )        
 }
 
-my @before_inc = grep { filter_not_core() } keys %mods;
+my @file_names = keys %mods;
+my @before_inc = grep { filter_not_core() } @file_names;
 my @after_inc;
 
+#TODO obviously this should be made into a method or configurable some how
+my $env_pass = '';
+if (defined($ENV{OBJECT_REMOTE_LOG_LEVEL})) {
+  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";
+}
+if (defined($ENV{OBJECT_REMOTE_LOG_SELECTIONS})) {
+  my $selections = $ENV{OBJECT_REMOTE_LOG_SELECTIONS};
+  $env_pass .= '$ENV{OBJECT_REMOTE_LOG_SELECTIONS} = "' . $selections . "\";\n";
+}
+
+
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
   # the original file's code, look for the end of this BEGIN block or the
@@ -66,7 +85,7 @@ my $start = stripspace <<'END_START';
   my (%fatpacked,%fatpacked_extra);
 END_START
 
-$start .= 'my %exclude = map { $_ => 1 } qw(' . join(' ', @exclude_mods) . ");\n";
+$start .= 'my %exclude = map { $_ => 1 } (\'' . join("','", @exclude_mods) . "');\n";
 
 my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
@@ -78,7 +97,7 @@ my $end = stripspace <<'END_END';
         return undef; 
       }
  
-      warn "handling $_[1]";
+      #warn "Handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
@@ -95,7 +114,11 @@ my $end = stripspace <<'END_END';
 
   use strictures 1;
   use Object::Remote::Node;
-  Object::Remote::Node->run;
+  
+  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, $/) = ($_); <> }),
@@ -115,6 +138,6 @@ my @segments = (
   map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @after_inc),
 );
 
-our $DATA = join "\n", $start, @segments, $end;
+our $DATA = join "\n", $start, $env_pass, @segments, $end;
 
 1;