From e914b733cd74a7efedf5a185da1c44f6c5f72fa9 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 20 Aug 2015 15:49:37 +0200
Subject: [PATCH] Handle API requests in the ErrorController

refs #9606
---
 application/controllers/ErrorController.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index 1c01b1672..dff721b36 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -14,6 +14,9 @@ use Icinga\Web\Controller\ActionController;
  */
 class ErrorController extends ActionController
 {
+    /**
+     * {@inheritdoc}
+     */
     protected $requiresAuthentication = false;
 
     /**
@@ -23,7 +26,7 @@ class ErrorController extends ActionController
     {
         $error      = $this->_getParam('error_handler');
         $exception  = $error->exception;
-
+        /** @var \Exception $exception */
         Logger::error($exception);
         Logger::error('Stacktrace: %s', $exception->getTraceAsString());
 
@@ -74,6 +77,15 @@ class ErrorController extends ActionController
                 }
                 break;
         }
+
+        if ($this->getRequest()->getIsApiRequest()) {
+            // @TODO(el): Use ApiResponse class for unified response handling.
+            $this->getRequest()->sendJson(array(
+                'status'    => 'error',
+                'message'   => $this->view->message
+            ));
+        }
+
         $this->view->request = $error->request;
     }
 }