Check if `\Throwable` instead of `\Exception`..

..everywhere else...

fixes #5079
This commit is contained in:
Johannes Meyer 2023-08-10 14:08:55 +02:00
parent de178d0086
commit 65b3006adf
2 changed files with 4 additions and 4 deletions

View File

@ -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 @@ class Logger
if (count($arguments) === 1) {
$message = $arguments[0];
if ($message instanceof Exception) {
if ($message instanceof Throwable) {
$messages = array();
$error = $message;
do {
@ -250,7 +250,7 @@ class Logger
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));
},

View File

@ -22,7 +22,7 @@ class IcingaException extends Exception
$args = array_slice(func_get_args(), 1);
$exc = null;
foreach ($args as &$arg) {
if ($arg instanceof Exception) {
if ($arg instanceof Throwable) {
$exc = $arg;
}
}