tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 06:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check if \Throwable instead of \Exception..

Browse Source 
..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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
library/Icinga/Application/Logger.php
View File

@ -3,13 +3,13 @@
namespace Icinga\Application; namespace Icinga\Application;
use Exception;
use Icinga\Data\ConfigObject; use Icinga\Data\ConfigObject;
use Icinga\Application\Logger\Writer\FileWriter; use Icinga\Application\Logger\Writer\FileWriter;
use Icinga\Application\Logger\Writer\SyslogWriter; use Icinga\Application\Logger\Writer\SyslogWriter;
use Icinga\Exception\ConfigurationError; use Icinga\Exception\ConfigurationError;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
use Icinga\Util\Json; use Icinga\Util\Json;
use Throwable;
/** /**
* Logger * Logger
@ -234,7 +234,7 @@ class Logger
if (count($arguments) === 1) { if (count($arguments) === 1) {
$message = $arguments[0]; $message = $arguments[0];
if ($message instanceof Exception) { if ($message instanceof Throwable) {
$messages = array(); $messages = array();
$error = $message; $error = $message;
do { do {
@ -250,7 +250,7 @@ class Logger
array_shift($arguments), array_shift($arguments),
array_map( array_map(
function ($a) { function ($a) {
return is_string($a) ? $a : ($a instanceof Exception return is_string($a) ? $a : ($a instanceof Throwable
? IcingaException::describe($a) ? IcingaException::describe($a)
: Json::encode($a)); : Json::encode($a));
}, },

2
library/Icinga/Exception/IcingaException.php
View File

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