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

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 23c8296..77e6928 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -4,6 +4,10 @@ use strictures 1;
 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) = @_;
   $text =~ /^(\s+)/ && $text =~ s/^$1//mg;
@@ -38,18 +42,40 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
+my %exclude = map { $_ => 1 } @exclude_mods; 
 my %mods = reverse @inc;
 
-my @non_core = grep +(
+foreach(keys(%mods)) {
+  if ($exclude{ $mods{$_} }) {
+    delete($mods{$_});    
+  }
+}
+
+sub filter_not_core {
   not (
     /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-  )
-), 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 @core_non_arch = grep +(
-#  /^\Q$Config{privlibexp}/
-#), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
-my @core_non_arch; 
 
 my $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
@@ -58,17 +84,27 @@ my $start = stripspace <<'END_START';
   BEGIN {
   my (%fatpacked,%fatpacked_extra);
 END_START
+
+$start .= 'my %exclude = map { $_ => 1 } (\'' . join("','", @exclude_mods) . "');\n";
+
 my $end = stripspace <<'END_END';
   s/^  //mg for values %fatpacked, values %fatpacked_extra;
 
   sub load_from_hash {
     if (my $fat = $_[0]->{$_[1]}) {
+      if ($exclude{$_[1]}) {
+        warn "Will not pre-load '$_[1]'";
+        return undef; 
+      }
+ 
+      #warn "Handling $_[1]";
       open my $fh, '<', \$fat;
       return $fh;
     }
+    
     #Uncomment this to find brokenness
     #warn "Missing $_[1]";
-    return
+    return;
   }
 
   unshift @INC, sub { load_from_hash(\%fatpacked, $_[1]) };
@@ -78,11 +114,15 @@ 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, $/) = ($_); <> }),
-              @non_core, @core_non_arch;
+              @before_inc, @after_inc;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
@@ -93,16 +133,11 @@ sub generate_fatpack_hash {
   .qq!${data}${name}\n!;
 }
 
-use Data::Dumper;
-warn "Dumping list of shipped modules";
-print STDERR "Core non-arch: ", Dumper(\@core_non_arch);
-print STDERR "Non-core: ", Dumper(\@non_core); 
-
 my @segments = (
-  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core),
-  map(generate_fatpack_hash('fatpacked_extra', $_), sort map $mods{$_}, @core_non_arch),
+  map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @before_inc),
+  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;