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

monitoring/config: make use of Config() 

Thee helper function supports lazy loading, requires less code and is
easier to read.
This commit is contained in:
Thomas Gelf 2014-06-24 21:22:38 +02:00
parent d5d3f5548f
commit f75a4430a6
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,6 @@
use \Exception; use \Exception;
use \Icinga\Application\Config as IcingaConfig;
use \Icinga\Config\PreservingIniWriter; use \Icinga\Config\PreservingIniWriter;
use \Icinga\Web\Controller\BaseConfigController; use \Icinga\Web\Controller\BaseConfigController;
use \Icinga\Web\Widget\Tab; use \Icinga\Web\Widget\Tab;
@ -72,11 +71,11 @@ class Monitoring_ConfigController extends BaseConfigController {
*/ */
public function indexAction() public function indexAction()
{ {
$this->view->tabs->activate('backends'); $this->view->tabs = $this->Module()->getConfigTabs()->activate('backends');
$this->view->messageBox = new AlertMessageBox(true); $this->view->messageBox = new AlertMessageBox(true);
foreach (array('backends', 'instances') as $element) { foreach (array('backends', 'instances') as $element) {
try { try {
$elementConfig = IcingaConfig::module('monitoring', $element); $elementConfig = $this->Config($element);
if ($elementConfig === null) { if ($elementConfig === null) {
$this->view->{$element} = array(); $this->view->{$element} = array();
} else { } else {
@ -101,11 +100,11 @@ class Monitoring_ConfigController extends BaseConfigController {
} }
$backendForm = new EditBackendForm(); $backendForm = new EditBackendForm();
$backendForm->setRequest($this->getRequest()); $backendForm->setRequest($this->getRequest());
$backendForm->setBackendConfiguration(IcingaConfig::module('monitoring', 'backends')->get($backend)); $backendForm->setBackendConfiguration($this->Config('backends')->get($backend));
if ($backendForm->isSubmittedAndValid()) { if ($backendForm->isSubmittedAndValid()) {
$newConfig = $backendForm->getConfig(); $newConfig = $backendForm->getConfig();
$config = IcingaConfig::module('monitoring', 'backends'); $config = $this->Config('backends');
$config->$backend = $newConfig; $config->$backend = $newConfig;
if ($this->writeConfiguration($config, 'backends')) { if ($this->writeConfiguration($config, 'backends')) {
$this->addSuccessMessage('Backend ' . $backend . ' Modified.'); $this->addSuccessMessage('Backend ' . $backend . ' Modified.');
@ -127,7 +126,7 @@ class Monitoring_ConfigController extends BaseConfigController {
$form = new CreateBackendForm(); $form = new CreateBackendForm();
$form->setRequest($this->getRequest()); $form->setRequest($this->getRequest());
if ($form->isSubmittedAndValid()) { if ($form->isSubmittedAndValid()) {
$configArray = IcingaConfig::module('monitoring', 'backends')->toArray(); $configArray = $this->Config('backends')->toArray();
$configArray[$form->getBackendName()] = $form->getConfig(); $configArray[$form->getBackendName()] = $form->getConfig();
if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) { if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) {
@ -157,7 +156,7 @@ class Monitoring_ConfigController extends BaseConfigController {
$form->setRemoveTarget('backend', $backend); $form->setRemoveTarget('backend', $backend);
if ($form->isSubmittedAndValid()) { if ($form->isSubmittedAndValid()) {
$configArray = IcingaConfig::module('monitoring', 'backends')->toArray(); $configArray = $this->Config('backends')->toArray();
unset($configArray[$backend]); unset($configArray[$backend]);
if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) { if ($this->writeConfiguration(new Zend_Config($configArray), 'backends')) {
@ -189,7 +188,7 @@ class Monitoring_ConfigController extends BaseConfigController {
$form->setRemoveTarget('instance', $instance); $form->setRemoveTarget('instance', $instance);
if ($form->isSubmittedAndValid()) { if ($form->isSubmittedAndValid()) {
$configArray = IcingaConfig::module('monitoring', 'instances')->toArray(); $configArray = $this->Config('instances')->toArray();
unset($configArray[$instance]); unset($configArray[$instance]);
if ($this->writeConfiguration(new Zend_Config($configArray), 'instances')) { if ($this->writeConfiguration(new Zend_Config($configArray), 'instances')) {
@ -216,10 +215,10 @@ class Monitoring_ConfigController extends BaseConfigController {
return; return;
} }
$form = new EditInstanceForm(); $form = new EditInstanceForm();
$form->setInstanceConfiguration(IcingaConfig::module('monitoring', 'instances')->get($instance)); $form->setInstanceConfiguration($this->Config('instances')->get($instance));
$form->setRequest($this->getRequest()); $form->setRequest($this->getRequest());
if ($form->isSubmittedAndValid()) { if ($form->isSubmittedAndValid()) {
$instanceConfig = IcingaConfig::module('monitoring', 'instances')->toArray(); $instanceConfig = $this->Config('instances')->toArray();
$instanceConfig[$instance] = $form->getConfig(); $instanceConfig[$instance] = $form->getConfig();
if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) { if ($this->writeConfiguration(new Zend_Config($instanceConfig), 'instances')) {
$this->addSuccessMessage('Instance Modified'); $this->addSuccessMessage('Instance Modified');
@ -240,7 +239,7 @@ 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'); $instanceConfig = $this->Config('instances');
if ($instanceConfig === null) { if ($instanceConfig === null) {
$instanceConfig = array(); $instanceConfig = array();
} else { } else {
@ -264,7 +263,7 @@ class Monitoring_ConfigController extends BaseConfigController {
*/ */
private function writeConfiguration($config, $file) private function writeConfiguration($config, $file)
{ {
$target = IcingaConfig::module('monitoring', $file)->getConfigFile(); $target = $this->Config($file)->getConfigFile();
$writer = new PreservingIniWriter(array('filename' => $target, 'config' => $config)); $writer = new PreservingIniWriter(array('filename' => $target, 'config' => $config));
try { try {
@ -288,7 +287,7 @@ class Monitoring_ConfigController extends BaseConfigController {
*/ */
private function isExistingBackend($backend) private function isExistingBackend($backend)
{ {
$backendCfg = IcingaConfig::module('monitoring', 'backends'); $backendCfg = $this->Config('backends');
return $backend && $backendCfg->get($backend); return $backend && $backendCfg->get($backend);
} }
@ -301,7 +300,7 @@ class Monitoring_ConfigController extends BaseConfigController {
*/ */
private function isExistingInstance($instance) private function isExistingInstance($instance)
{ {
$instanceCfg = IcingaConfig::module('monitoring', 'instances'); $instanceCfg = $this->Config('instances');
return $instanceCfg && $instanceCfg->get($instance); return $instanceCfg && $instanceCfg->get($instance);
} }
} }