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

Backend: Better implementation for createBackend 

Thanks eric!

fixes #7043
This commit is contained in:
Marius Hein 2014-09-01 16:11:34 +02:00
parent 63cb357d48
commit 1c24273c9b
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/monitoring/library/Monitoring/Backend.php
View File

@ -69,36 +69,31 @@ class Backend implements Selectable, Queryable, ConnectionInterface
*/ */
public static function createBackend($backendName = null) public static function createBackend($backendName = null)
{ {
$allBackends = array(); $config = IcingaConfig::module('monitoring', 'backends');
$defaultBackend = null; if ($config->count() === 0) {
foreach (IcingaConfig::module('monitoring', 'backends') as $name => $config) { throw new ConfigurationError(t('No backend has been configured'));
if (!(bool) $config->get('disabled', false) && $defaultBackend === null) {
$defaultBackend = $config;
if ($backendName === null) {
$backendName = $name;
}
}
$allBackends[$name] = $config;
} }
if (empty($allBackends)) { if ($backendName !== null) {
throw new ConfigurationError('No backend has been configured'); $backendConfig = $config->get($backendName);
} if ($backendConfig === null) {
if ($defaultBackend === null) {
throw new ConfigurationError('All backends are disabled');
}
if ($backendName === null) {
$backendConfig = $defaultBackend;
} else {
if (!array_key_exists($backendName, $allBackends)) {
throw new ConfigurationError('No configuration for backend %s', $backendName); throw new ConfigurationError('No configuration for backend %s', $backendName);
} }
$backendConfig = $allBackends[$backendName]; if ((bool) $backendConfig->get('disabled', false) === true) {
if ((bool) $backendConfig->get('disabled', false)) {
throw new ConfigurationError( throw new ConfigurationError(
'Configuration for backend %s available but backend is disabled', t('Configuration for backend %s available but backend is disabled'),
$backendName $backendName
); );
} }
} else {
foreach ($config as $name => $backendConfig) {
if ((bool) $config->get('disabled', false) === false) {
$backendName = $name;
break;
}
}
if ($backendName === null) {
throw new ConfigurationError(t('All backends are disabled'));
}
} }
$resource = ResourceFactory::create($backendConfig->resource); $resource = ResourceFactory::create($backendConfig->resource);
if ($backendConfig->type === 'ido' && $resource->getDbType() !== 'oracle') { if ($backendConfig->type === 'ido' && $resource->getDbType() !== 'oracle') {