tyler.durden/icingaweb2-module-director
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2-module-director.git synced 2025-07-30 01:04:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ActionController: better error handling

Browse Source
This commit is contained in:
Thomas Gelf 2016-02-03 00:53:05 +01:00
parent 5b893dc47e
commit 4eb3b1936c
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/Director/Web/Controller/ActionController.php
View File

@ -5,6 +5,7 @@ namespace Icinga\Module\Director\Web\Controller;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Data\Paginatable; use Icinga\Data\Paginatable;
use Icinga\Exception\AuthenticationException; use Icinga\Exception\AuthenticationException;
use Icinga\Exception\ConfigurationError;
use Icinga\Exception\NotFoundError; use Icinga\Exception\NotFoundError;
use Icinga\Module\Director\Core\RestApiClient; use Icinga\Module\Director\Core\RestApiClient;
use Icinga\Module\Director\Core\CoreApi; use Icinga\Module\Director\Core\CoreApi;
@ -76,6 +77,15 @@ abstract class ActionController extends Controller
} }
} }
protected function sendJsonError($message, $code = null)
{
if ($code !== null) {
$this->setHttpResponseCode((int) $code);
}
$this->sendJson((object) array('error' => $message));
}
protected function setConfigTabs() protected function setConfigTabs()
{ {
$this->view->tabs = Widget::create('tabs')->add('deploymentlog', array( $this->view->tabs = Widget::create('tabs')->add('deploymentlog', array(
@ -128,7 +138,11 @@ abstract class ActionController extends Controller
if ($resourceName) { if ($resourceName) {
$this->db = Db::fromResourceName($resourceName); $this->db = Db::fromResourceName($resourceName);
} else { } else {
$this->redirectNow('director'); if ($this->getRequest()->isApiRequest()) {
throw new ConfigError('Icinga Director is not correctly configured');
} else {
$this->redirectNow('director');
}
} }
} }