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=6b65a25114652c5e03189999faabbb1a9303cf37;hp=845c12b54055472a91449d91803a42516f587324;hb=624072a8803b6bb08260ff6f2b7fcb0dc05dd190;hpb=1ef3d225bfb434c7ae608946827419478c40a59e

diff --git a/lib/Object/Remote/FatNode.pm b/lib/Object/Remote/FatNode.pm
index 845c12b..6b65a25 100644
--- a/lib/Object/Remote/FatNode.pm
+++ b/lib/Object/Remote/FatNode.pm
@@ -4,6 +4,8 @@ use strictures 1;
 use Config;
 use B qw(perlstring);
 
+my @exclude_mods = qw(XSLoader.pm DynaLoader.pm);
+
 sub stripspace {
   my ($text) = @_;
   $text =~ /^(\s+)/ && $text =~ s/^$1//mg;
@@ -38,19 +40,31 @@ $command =~ s/\n/ /g;
 
 chomp(my @inc = qx($command));
 
+my %exclude = map { $_ => 1 } @exclude_mods; 
 my %mods = reverse @inc;
 
-my @non_core_non_arch = grep +(
+foreach(keys(%mods)) {
+  if ($exclude{ $mods{$_} }) {
+    delete($mods{$_});    
+  }
+}
+
+sub filter_not_core {
   not (
     /^\Q$Config{privlibexp}/ or /^\Q$Config{archlibexp}/
-    or /^\Q$Config{vendorarchexp}/ or /^\Q$Config{sitearchexp}/
-  )
-), grep !/\Q$Config{archname}/, grep !/\Q$Config{myarchname}/, keys %mods;
+  )        
+}
 
-my @core_non_arch = grep +(
-  /^\Q$Config{privlibexp}/
-  and not(/^\Q$Config{archlibexp}/ or /\Q$Config{archname}/ or /\Q$Config{myarchname}/)
-), keys %mods;
+my @file_names = keys %mods;
+my @before_inc = grep { filter_not_core() } @file_names;
+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 $start = stripspace <<'END_START';
   # This chunk of stuff was generated by Object::Remote::FatNode. To find
@@ -59,17 +73,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]) };
@@ -79,11 +103,11 @@ my $end = stripspace <<'END_END';
 
   use strictures 1;
   use Object::Remote::Node;
-  Object::Remote::Node->run;
+  Object::Remote::Node->run(watchdog_timeout => $WATCHDOG_TIMEOUT);
 END_END
 
 my %files = map +($mods{$_} => scalar do { local (@ARGV, $/) = ($_); <> }),
-              @non_core_non_arch, @core_non_arch;
+              @before_inc, @after_inc;
 
 sub generate_fatpack_hash {
   my ($hash_name, $orig) = @_;
@@ -95,10 +119,10 @@ sub generate_fatpack_hash {
 }
 
 my @segments = (
-    map(generate_fatpack_hash('fatpacked', $_), sort map $mods{$_}, @non_core_non_arch),
-    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;