tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MonitoringBackend: handle null name in a nice way 

When we get null as a backend name, we load the default one. While we
want to cache that null backend, it should still know about it's real
name.
This commit is contained in:
Thomas Gelf 2014-11-11 16:49:56 +01:00
parent 3f4110d33d
commit 6c0aa8dcc5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/monitoring/library/Monitoring/Backend/MonitoringBackend.php
View File

@ -62,7 +62,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
{
if (! array_key_exists($name, self::$instances)) {
$config = static::loadConfig($name);
list($foundName, $config) = static::loadConfig($name);
$type = $config->get('type');
$class = implode(
'\\',
@ -80,7 +80,10 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
);
}
self::$instances[$name] = new $class($name, $config);
self::$instances[$name] = new $class($foundName, $config);
if ($name === null) {
self::$instances[$foundName] = self::$instances[$name];
}
}
return self::$instances[$name];
@ -144,7 +147,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
foreach ($backends as $name => $config) {
$count++;
if ((bool) $config->get('disabled', false) === false) {
return $config;
return array($name, $config);
}
}
@ -174,7 +177,7 @@ class MonitoringBackend implements Selectable, Queryable, ConnectionInterface
);
}
return $config;
return array($name, $config);
}
}