upstream/icingaweb2-module-businessprocess
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-businessprocess.git synced 2026-01-29 23:09:25 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

BpConfig: Don't die due to circular references

Browse source
This commit is contained in:
Johannes Meyer 2019-02-04 13:47:22 +01:00
parent 1a36e4d94a
commit aa8f070a00
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
library/Businessprocess/BpConfig.php
View file

@ -437,13 +437,18 @@ class BpConfig
return $this->nodes;
}
public function hasNode($name)
public function hasNode($name, &$usedConfigs = null)
{
if (array_key_exists($name, $this->nodes)) {
return true;
} elseif (! empty($this->importedConfigs)) {
$usedConfigs[$this->getName()] = true;
foreach ($this->importedConfigs as $config) {
if ($config->hasNode($name)) {
if (isset($usedConfigs[$config->getName()])) {
continue;
}
if ($config->hasNode($name, $usedConfigs)) {
return true;
}
}
@ -498,12 +503,17 @@ class BpConfig
return $this;
}
public function listInvolvedHostNames()
public function listInvolvedHostNames(&$usedConfigs = null)
{
$hosts = $this->hosts;
if (! empty($this->importedConfigs)) {
$usedConfigs[$this->getName()] = true;
foreach ($this->importedConfigs as $config) {
$hosts += array_flip($config->listInvolvedHostNames());
if (isset($usedConfigs[$config->getName()])) {
continue;
}
$hosts += array_flip($config->listInvolvedHostNames($usedConfigs));
}
}
@ -590,11 +600,12 @@ class BpConfig
}
/**
* @param $name
* @return Node
* @throws Exception
* @param string $name
* @param array $usedConfigs
* @return Node
* @throws Exception
*/
public function getNode($name)
public function getNode($name, &$usedConfigs = null)
{
if ($name === '__unbound__') {
return $this->getUnboundBaseNode();
@ -603,9 +614,14 @@ class BpConfig
if (array_key_exists($name, $this->nodes)) {
return $this->nodes[$name];
} elseif (! empty($this->importedConfigs)) {
$usedConfigs[$this->getName()] = true;
foreach ($this->importedConfigs as $config) {
if ($config->hasNode($name)) {
return $config->getNode($name);
if (isset($usedConfigs[$config->getName()])) {
continue;
}
if ($config->hasNode($name, $usedConfigs)) {
return $config->getNode($name, $usedConfigs);
}
}
}