tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-31 01:34:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

BasketSnapshot: simplify error handling

Browse Source 
We have no IcingaObject here, they're all stdClass instances
This commit is contained in:
Thomas Gelf 2022-10-25 11:10:05 +02:00
parent 470137b5c2
commit ad5dfc8496
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Director/DirectorObject/Automation/BasketSnapshot.php
View File

@ -424,22 +424,18 @@ class BasketSnapshot extends DbObject
return JsonString::encode($this->objects, JSON_PRETTY_PRINT); return JsonString::encode($this->objects, JSON_PRETTY_PRINT);
} catch (JsonEncodeException $e) { } catch (JsonEncodeException $e) {
foreach ($this->objects as $type => $objects) { foreach ($this->objects as $type => $objects) {
foreach ($objects as $key => $object) { foreach ($objects as $object) {
try { try {
JsonString::encode($object); JsonString::encode($object);
} catch (JsonEncodeException $singleError) { } catch (JsonEncodeException $singleError) {
if ($object instanceof IcingaObject) { $dump = var_export($object, 1);
$name = $object->getObjectName(); if (function_exists('iconv')) {
} else { $dump = iconv('UTF-8', 'UTF-8//IGNORE', $dump);
$name = var_export($object, 1);
if (function_exists('iconv')) {
$name = iconv('UTF-8', 'UTF-8//IGNORE', $name);
}
} }
throw new JsonEncodeException(sprintf( throw new JsonEncodeException(sprintf(
'Failed to encode object ot type "%s": "%s", %s', 'Failed to encode object ot type "%s": %s, %s',
$type, $type,
$name, $dump,
$singleError->getMessage() $singleError->getMessage()
), $singleError->getCode()); ), $singleError->getCode());
} }