tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-09-26 03:09:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

IcingaObject: externalize imported object loading

Browse Source
This commit is contained in:
Thomas Gelf 2016-06-16 21:40:22 +02:00
parent d042f8d599
commit 57656f8dd9
2 changed files with 13 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,6 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
private $imports; private $imports;
private $importedObjects;
private $ranges; private $ranges;
private $arguments; private $arguments;
@ -557,39 +555,6 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
return $this->imports; return $this->imports;
} }
// TODO: what happens if imports change at runtime?
public function importedObjects()
{
$this->assertImportsSupport();
if ($this->importedObjects === null) {
$this->importedObjects = array();
foreach ($this->imports()->listImportNames() as $import) {
$this->importedObjects[$import] = $this->loadImportedObject($import);
}
}
return $this->importedObjects;
}
protected function loadImportedObject($name)
{
if (is_array($this->getKeyName())) {
// Affects services only:
return self::load(
array('object_name' => $name),
$this->connection
);
} else {
return self::load($name, $this->connection);
}
}
public function clearImportedObjects()
{
$this->importedObjects = null;
return $this;
}
public function setImports($imports) public function setImports($imports)
{ {
if (! is_array($imports) && $imports !== null) { if (! is_array($imports) && $imports !== null) {
@ -598,7 +563,6 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$this->imports()->set($imports); $this->imports()->set($imports);
if ($this->imports()->hasBeenModified()) { if ($this->imports()->hasBeenModified()) {
$this->clearImportedObjects();
$this->invalidateResolveCache(); $this->invalidateResolveCache();
} }
} }
@ -779,7 +743,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
$vals['_MERGED_'] = (object) array(); $vals['_MERGED_'] = (object) array();
$vals['_INHERITED_'] = (object) array(); $vals['_INHERITED_'] = (object) array();
$vals['_ORIGINS_'] = (object) array(); $vals['_ORIGINS_'] = (object) array();
$objects = $this->importedObjects(); $objects = $this->imports()->getObjects();
$get = 'get' . $what; $get = 'get' . $what;
$getInherited = 'getInherited' . $what; $getInherited = 'getInherited' . $what;
@ -793,6 +757,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
if (in_array($key, $blacklist)) { if (in_array($key, $blacklist)) {
continue; continue;
} }
// $vals[$name]->$key = $value; // $vals[$name]->$key = $value;
$vals['_MERGED_']->$key = $value; $vals['_MERGED_']->$key = $value;
$vals['_INHERITED_']->$key = $value; $vals['_INHERITED_']->$key = $value;
@ -1658,7 +1623,7 @@ abstract class IcingaObject extends DbObject implements IcingaConfigRenderer
if ($resolved) { if ($resolved) {
if ($this->supportsImports()) { if ($this->supportsImports()) {
$set = clone($set); $set = clone($set);
foreach ($this->importedObjects() as $parent) { foreach ($this->imports()->getObjects() as $parent) {
$set->inheritFrom($parent->getRelatedSet($property)); $set->inheritFrom($parent->getRelatedSet($property));
} }
} }

10
library/Director/Objects/IcingaObjectImports.php
View File

@ -196,6 +196,16 @@ class IcingaObjectImports implements Iterator, Countable, IcingaConfigRenderer
return $this; return $this;
} }
public function getObjects()
{
$list = array();
foreach ($this->listImportNames() as $name) {
$list[$name] = $this->getObject($name);
}
return $list;
}
protected function getObject($name) protected function getObject($name)
{ {
if (array_key_exists($name, $this->objects)) { if (array_key_exists($name, $this->objects)) {