tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-24 22:34:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix instance config error handling in CommandController

Browse Source
This commit is contained in:
Thomas Gelf 2014-03-06 18:35:44 +00:00
parent a8e4a6a0f3
commit 1ffea41bed
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/application/controllers/CommandController.php
View File

@ -139,7 +139,7 @@ class Monitoring_CommandController extends ActionController
public function init()
{
if ($this->_request->isPost()) {
$instance = $this->_request->getPost("instance");
$instance = $this->_request->getPost('instance');
$targetConfig = Config::module('monitoring', 'instances');
if ($instance) {
if ($targetConfig->get($instance)) {
@ -148,12 +148,11 @@ class Monitoring_CommandController extends ActionController
throw new ConfigurationError('Instance is not configured: '. $instance);
}
} else {
$targetInfo = $targetConfig->current(); // Take the very first section
if ($targetInfo === false) {
throw new ConfigurationError("No instances are configured yet");
} else {
if ($targetConfig && $targetInfo = $targetConfig->current()) {
// Take the very first section
$this->target = new CommandPipe($targetInfo);
} else {
throw new ConfigurationError('No instances are configured yet');
}
}
}
@ -351,6 +350,7 @@ class Monitoring_CommandController extends ActionController
*/
public function reschedulenextcheckAction()
{
$this->addTitleTab('Reschedule Next Check');
$this->setSupportedParameters(array('host', 'service'));
$form = new RescheduleNextCheckForm();
$form->setRequest($this->getRequest());