Item14152: Don't die if Devel::Leak::Object cannot be loaded.

foswiki · Oct 7, 2016 · 9cca120 · 9cca120
1 parent 549961c
commit 9cca120
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/core/bin/foswiki_debug.psgi b/core/bin/foswiki_debug.psgi
@@ -37,22 +37,26 @@ use Foswiki::App;
 use Devel::Leak;
 use Devel::Leak::Object;
 
-use constant CHECKLEAK => 0;
+use constant CHECKLEAK => $ENV{FOSWIKI_CHECKLEAK} // 0;
 
 BEGIN {
     if (CHECKLEAK) {
         eval "use Devel::Leak::Object qw{ GLOBAL_bless };";
-        die $@ if $@;
-        $Devel::Leak::Object::TRACKSOURCELINES = 1;
-        $Devel::Leak::Object::TRACKSTACK       = 1;
+        if ($@) {
+            say STDERR "!!! Failed to load Devel::Leak::Object\n", $@;
+        }
+        else {
+            $Devel::Leak::Object::TRACKSOURCELINES = 1;
+            $Devel::Leak::Object::TRACKSTACK       = 1;
+        }
     }
 }
 
 my $app = sub {
     my $env = shift;
 
     Devel::Leak::Object::checkpoint if CHECKLEAK;
-    
+
     $env->{FOSWIKI_SCRIPTS} = $scriptDir unless $env->{FOSWIKI_SCRIPTS};
 
     my $rc = Foswiki::App->run( env => $env, );