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

Raise error if a configuration file is missing

This commit is contained in:
Alexander Klimov 2014-03-07 17:27:18 +01:00
parent b7b6a08fbf
commit 9963a21236
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/monitoring/application/controllers/ConfigController.php
View File

@ -237,7 +237,12 @@ class Monitoring_ConfigController extends BaseConfigController {
$form = new CreateInstanceForm(); $form = new CreateInstanceForm();
$form->setRequest($this->getRequest()); $form->setRequest($this->getRequest());
if ($form->isSubmittedAndValid()) { if ($form->isSubmittedAndValid()) {
$instanceConfig = IcingaConfig::module('monitoring', 'instances')->toArray(); $instanceConfig = IcingaConfig::module('monitoring', 'instances');
if ($instanceConfig === null) {
$instanceConfig = array();
} else {
$instanceConfig = $instanceConfig->toArray();
}
$instanceConfig[$form->getInstanceName()] = $form->getConfig()->toArray(); $instanceConfig[$form->getInstanceName()] = $form->getConfig()->toArray();
if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) { if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) {
$this->addSuccessMessage('Instance Creation Succeeded'); $this->addSuccessMessage('Instance Creation Succeeded');
@ -256,8 +261,14 @@ class Monitoring_ConfigController extends BaseConfigController {
*/ */
private function writeConfiguration($config, $file) private function writeConfiguration($config, $file)
{ {
$configFile = IcingaConfig::module('monitoring', $file);
if ($configFile === null) {
throw new Exception('Configuration file is missing!');
} else {
$configFile = $configFile->getConfigFile();
}
$writer = new PreservingIniWriter(array( $writer = new PreservingIniWriter(array(
'filename' => IcingaConfig::module('monitoring', $file)->getConfigFile(), 'filename' => $configFile,
'config' => $config 'config' => $config
)); ));