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

IcingaObject: do not fail when rendering objects...

Browse Source 
...without imports support

fixes #12618
This commit is contained in:
Thomas Gelf 2016-10-13 11:11:35 +00:00
parent 1a2cede13f
commit c1afda4392
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/Director/Objects/IcingaObject.php
View File

@ -1412,13 +1412,22 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
return $this->zone;
}
try {
if ($zoneId = $this->getResolvedProperty('zone_id')) {
// Config has a lookup cache, is faster:
return $config->getZoneName($zoneId);
if ($this->hasProperty('zone_id')) {
if (! $this->supportsImports()) {
if ($zoneId = $this->zone_id) {
// Config has a lookup cache, is faster:
return $config->getZoneName($zoneId);
}
}
try {
if ($zoneId = $this->getResolvedProperty('zone_id')) {
// Config has a lookup cache, is faster:
return $config->getZoneName($zoneId);
}
} catch (Exception $e) {
return self::RESOLVE_ERROR;
}
} catch (Exception $e) {
return self::RESOLVE_ERROR;
}
if ($this->prefersGlobalZone()) {