Check if \Throwable instead of \Exception..

..everywhere else... fixes #5079
Icinga · Aug 10, 2023 · 65b3006 · 65b3006
1 parent de178d0
commit 65b3006
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/library/Icinga/Application/Logger.php b/library/Icinga/Application/Logger.php
@@ -3,13 +3,13 @@
 
 namespace Icinga\Application;
 
-use Exception;
 use Icinga\Data\ConfigObject;
 use Icinga\Application\Logger\Writer\FileWriter;
 use Icinga\Application\Logger\Writer\SyslogWriter;
 use Icinga\Exception\ConfigurationError;
 use Icinga\Exception\IcingaException;
 use Icinga\Util\Json;
+use Throwable;
 
 /**
  * Logger
@@ -234,7 +234,7 @@ protected static function formatMessage(array $arguments)
         if (count($arguments) === 1) {
             $message = $arguments[0];
 
-            if ($message instanceof Exception) {
+            if ($message instanceof Throwable) {
                 $messages = array();
                 $error = $message;
                 do {
@@ -250,7 +250,7 @@ protected static function formatMessage(array $arguments)
             array_shift($arguments),
             array_map(
                 function ($a) {
-                    return is_string($a) ? $a : ($a instanceof Exception
+                    return is_string($a) ? $a : ($a instanceof Throwable
                         ? IcingaException::describe($a)
                         : Json::encode($a));
                 },

diff --git a/library/Icinga/Exception/IcingaException.php b/library/Icinga/Exception/IcingaException.php
@@ -22,7 +22,7 @@ public function __construct($message)
         $args = array_slice(func_get_args(), 1);
         $exc = null;
         foreach ($args as &$arg) {
-            if ($arg instanceof Exception) {
+            if ($arg instanceof Throwable) {
                 $exc = $arg;
             }
         }