Item13897: A bit more on error/warnings handling.

foswiki · May 2, 2016 · cb4a63d · cb4a63d
1 parent a75b8b8
commit cb4a63d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/core/lib/Foswiki.pm b/core/lib/Foswiki.pm
@@ -290,7 +290,7 @@ BEGIN {
             # FOSWIKI_ASSERTS. If ASSERTs are off, this is assumed to be a
             # production environment, and no stack traces or paths are
             # output to the browser.
-            $SIG{'__WARN__'} = sub { die @_ };
+            #$SIG{'__WARN__'} = sub { die @_ };
             $Error::Debug = 1;    # verbose stack traces, please
         }
         else {

diff --git a/core/lib/Foswiki/Plugin.pm b/core/lib/Foswiki/Plugin.pm
@@ -156,11 +156,12 @@ sub BUILD {
         local $SIG{__WARN__};
         eval "use $p";
         if ($@) {
-            my $errMessage = ref($@) ? $@->stringify : $@;
-            push(
-                @{ $this->errors },
-                "$p could not be loaded.  Errors were:\n$@\n----"
-            );
+            my $errMessage =
+                "$p could not be loaded.  Errors were:\n"
+              . Foswiki::Exception::errorStr($@)
+              . "\n----";
+            push( @{ $this->errors }, $errMessage );
+            Foswiki::Func::writeDebug($errMessage);
             $this->disabled(1);
             $this->reason('no_load_plugin');
         }