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

Quickfix to get master-1 running

This commit is contained in:
Thomas Gelf 2014-03-04 09:31:17 +00:00
parent 07d04628cf
commit 3ac276e652
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/Icinga/Application/Modules/Manager.php
View File

@ -153,7 +153,7 @@ class Manager
$link = $this->enableDir . '/' . $file; $link = $this->enableDir . '/' . $file;
if (! is_link($link)) { if (! is_link($link)) {
Logger::warn( Logger::warning(
'Found invalid module in enabledModule directory "%s": "%s" is not a symlink', 'Found invalid module in enabledModule directory "%s": "%s" is not a symlink',
$this->enableDir, $this->enableDir,
$link $link
@ -163,7 +163,7 @@ class Manager
$dir = realpath($link); $dir = realpath($link);
if (!file_exists($dir) || !is_dir($dir)) { if (!file_exists($dir) || !is_dir($dir)) {
Logger::warn( Logger::warning(
'Found invalid module in enabledModule directory "%s": "%s" points to non existing path "%s"', 'Found invalid module in enabledModule directory "%s": "%s" points to non existing path "%s"',
$this->enableDir, $this->enableDir,
$link, $link,
@ -268,7 +268,6 @@ class Manager
$this->enabledDirs[$name] = $link; $this->enabledDirs[$name] = $link;
$this->loadModule($name); $this->loadModule($name);
$this->getModule($name)->launchRegisterScript();
return $this; return $this;
} }
@ -513,15 +512,15 @@ class Manager
foreach ($this->modulePaths as $basedir) { foreach ($this->modulePaths as $basedir) {
$canonical = realpath($basedir); $canonical = realpath($basedir);
if ($canonical === false) { if ($canonical === false) {
Logger::warn('Module path "%s" does not exist', $basedir); Logger::warning('Module path "%s" does not exist', $basedir);
continue; continue;
} }
if (!is_dir($canonical)) { if (!is_dir($canonical)) {
Logger::err('Module path "%s" is not a directory', $canonical); Logger::error('Module path "%s" is not a directory', $canonical);
continue; continue;
} }
if (!is_readable($canonical)) { if (!is_readable($canonical)) {
Logger::err('Module path "%s" is not readable', $canonical); Logger::error('Module path "%s" is not readable', $canonical);
continue; continue;
} }
if (($dh = opendir($canonical)) !== false) { if (($dh = opendir($canonical)) !== false) {
@ -533,7 +532,7 @@ class Manager
if (! array_key_exists($file, $this->installedBaseDirs)) { if (! array_key_exists($file, $this->installedBaseDirs)) {
$this->installedBaseDirs[$file] = $canonical . '/' . $file; $this->installedBaseDirs[$file] = $canonical . '/' . $file;
} else { } else {
Logger::warn( Logger::warning(
'Module "%s" already exists in installation path "%s" and is ignored.', 'Module "%s" already exists in installation path "%s" and is ignored.',
$canonical . '/' . $file, $canonical . '/' . $file,
$this->installedBaseDirs[$file] $this->installedBaseDirs[$file]