Ensure Module::Runtime use_package_optimistically works.

[scpubgit/Object-Remote.git] / lib / Object / Remote / ModuleLoader.pm

diff --git a/lib/Object/Remote/ModuleLoader.pm b/lib/Object/Remote/ModuleLoader.pm
index 8b2e6c2..9d4273e 100644 (file)
--- a/lib/Object/Remote/ModuleLoader.pm
+++ b/lib/Object/Remote/ModuleLoader.pm
@@ -3,18 +3,37 @@ package Object::Remote::ModuleLoader;
 BEGIN {
   package Object::Remote::ModuleLoader::Hook;
   use Moo;
-  use Object::Remote::Logging qw(:log);
+  use Object::Remote::Logging qw( :log :dlog );
+  use Try::Tiny;
   has sender => (is => 'ro', required => 1);
 
   # unqualified INC forced into package main
   sub Object::Remote::ModuleLoader::Hook::INC {
     my ($self, $module) = @_;
     log_debug { "Loading $module via " . ref($self) };
-    if (my $code = $self->sender->source_for($module)) {
-      open my $fh, '<', \$code;
-      return $fh;
+    try
+    {
+      if (my $code = $self->sender->source_for($module)) {
+        open my $fh, '<', \$code;
+        Dlog_trace { "Module sender successfully sent code for '$module': $code" } $code;
+        return $fh;
+      }
+      log_trace { "Module sender did not return code for '$module'" };
+      return;
+    }
+    catch
+    {
+      log_trace { "Module sender blew up - $_" };
+      if($_ =~ /Can't locate/)
+      {
+        # Fudge the error messge to make it work with
+        # Module::Runtime use_package_optimistically
+        # Module::Runtime wants - /\ACan't locate \Q$fn\E .+ at \Q@{[__FILE__]}\E line/
+        my ($package, $file, $line) = caller(9);
+        s/(in \@INC.)/$1 at $file line $line/;
+      }
+      die $_;
     }
-    return;
   }
 }
 
@@ -31,7 +50,7 @@ sub _build_inc_hook {
   log_debug { "Constructing module builder hook" };
   my $hook = Object::Remote::ModuleLoader::Hook->new(sender => $self->module_sender);
   log_trace { "Done constructing module builder hook" };
-  return $hook;   
+  return $hook;
 }
 
 sub BUILD { shift->enable }