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

Present the fact that Icinga Web 2's config directory isn't readable in a nicer way 

fixes #11119
This commit is contained in:
Alexander A. Klimov 2016-02-25 17:31:09 +01:00
parent 4751df692d
commit 1aada1abbb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Icinga/Cli/Loader.php
View File

@ -5,6 +5,7 @@ namespace Icinga\Cli;
use Icinga\Application\ApplicationBootstrap as App;
use Icinga\Exception\IcingaException;
use Icinga\Exception\NotReadableError;
use Icinga\Exception\ProgrammingError;
use Icinga\Cli\Params;
use Icinga\Cli\Screen;
@ -421,10 +422,14 @@ class Loader
{
if ($this->modules === null) {
$this->modules = array();
$this->modules = array_unique(array_merge(
$this->app->getModuleManager()->listEnabledModules(),
$this->app->getModuleManager()->listLoadedModules()
));
try {
$this->modules = array_unique(array_merge(
$this->app->getModuleManager()->listEnabledModules(),
$this->app->getModuleManager()->listLoadedModules()
));
} catch (NotReadableError $e) {
$this->fail($e->getMessage());
}
}
return $this->modules;
}