Merge pull request #232 from bigfork/silent-exceptions

Fix issue where exceptions triggered by extensions could be silently swallowed
silverstripe · May 11, 2021 · 7209d5c · 7209d5c
2 parents a44ee69 + b404837
commit 7209d5c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/Helper/ErrorHandling.php b/src/Helper/ErrorHandling.php
@@ -51,7 +51,7 @@ public static function safeExtend(
         try {
             $retVal = $object->extend($method, $a1, $a2, $a3, $a4, $a5, $a6, $a7);
         } catch (\Exception $ex) {
-            if ($logger = Logging::getLogger()) {
+            if ($logger = Logging::getExceptionLogger()) {
                 $logger->warning(
                     'An error occurred when trying to run extension point: '. $object->class . '->' . $method,
                     [
@@ -89,7 +89,7 @@ public static function safeguard(\Closure $method, $errorMessage)
             restore_error_handler();
             return $retVal;
         } catch (\Exception $ex) {
-            if ($logger = Logging::getLogger()) {
+            if ($logger = Logging::getExceptionLogger()) {
                 $logger->warning($errorMessage, [
                     'exception' => $ex
                 ]);

diff --git a/src/Helper/Logging.php b/src/Helper/Logging.php
@@ -49,6 +49,20 @@ public static function getLogger()
         return $logger;
     }
 
+    /**
+     * @return \Psr\Log\LoggerInterface
+     */
+    public static function getExceptionLogger()
+    {
+        $logger = null;
+        try {
+            $logger = Injector::inst()->get('SilverStripe\Omnipay\ExceptionLogger');
+        } catch (NotFoundExceptionInterface $e) {
+            /* no op */
+        }
+        return $logger;
+    }
+
     /**
      * Prepare data for logging by cleaning up the data or simplify it.
      * @param mixed $data the incoming data to log