Added an exception listener

HeahDude · HeahDude · commit 93b734d76f4f · 2016-05-09T21:02:26.000+02:00
diff --git a/app/config/services.yml b/app/config/services.yml
@@ -33,3 +33,8 @@ services:
     app.github.listener_factory:
         class: AppBundle\Issues\GitHubListenerFactory
         arguments: ['@app.github.labels_api', '%github_listeners%']
+
+    app.github.exception_listener:
+        class: Appbundle\Listener\ExceptionListener
+        tags:
+            - { name: kernel.event_subscriber }
diff --git a/src/AppBundle/Controller/WebhookController.php b/src/AppBundle/Controller/WebhookController.php
@@ -3,6 +3,7 @@
 namespace AppBundle\Controller;
 
 use AppBundle\Event\GitHubEvent;
+use AppBundle\Exception\GitHubException;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
@@ -19,12 +20,12 @@ public function githubAction(Request $request)
     {
         $data = json_decode($request->getContent(), true);
         if (null === $data) {
-            throw new \Exception('Invalid JSON body!');
+            throw new GitHubException('Invalid JSON body!');
         }
 
         $repository = isset($data['repository']['full_name']) ? $data['repository']['full_name'] : null;
         if (empty($repository)) {
-            throw new \Exception('No repository name!');
+            throw new GitHubException('No repository name!');
         }
 
         $listener = $this->get('app.github.listener_factory')->createFromRepository($repository);
@@ -35,7 +36,11 @@ public function githubAction(Request $request)
         $event = new GitHubEvent($data);
         $eventName = $request->headers->get('X-Github-Event');
 
-        $dispatcher->dispatch('github.'.$eventName, $event);
+        try {
+            $dispatcher->dispatch('github.'.$eventName, $event);
+        } catch (\Exception $e) {
+            throw new GitHubException(sprintf('Failed dispatching "%s" event for "%s" repository.', $eventName, $repository), 0, $e);
+        }
 
         $responseData = $event->getResponseData();
 
diff --git a/src/AppBundle/Exception/GitHubException.php b/src/AppBundle/Exception/GitHubException.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AppBundle\Exception;
+
+/**
+ * GitHubException.
+ *
+ * @author Jules Pietri <jules@heahprod.com>
+ */
+class GitHubException extends \Exception
+{
+}
diff --git a/src/AppBundle/Listener/ExceptionListener.php b/src/AppBundle/Listener/ExceptionListener.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace AppBundle\Listener;
+
+use AppBundle\Exception\GitHubException;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+
+/**
+ * ExceptionListener.
+ *
+ * @author Jules Pietri <jules@heahprod.com>
+ */
+class ExceptionListener implements EventSubscriberInterface
+{
+    public function onGitHubException(GetResponseForExceptionEvent $event)
+    {
+        $exception = $event->getException();
+        if (!$exception instanceof GitHubException) {
+            return;
+        }
+
+        $message = $exception->getMessage();
+        if ($previous = $exception->getPrevious()) {
+            $message .= ' => '.$previous->getMessage();
+        }
+
+        $event->setResponse(new JsonResponse(array('error' => $message), 500));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function getSubscribedEvents()
+    {
+        return array(
+            KernelEvents::EXCEPTION => 'onGitHubException',
+        );
+    }
+}
diff --git a/src/AppBundle/Tests/Controller/WebhookControllerTest.php b/src/AppBundle/Tests/Controller/WebhookControllerTest.php
@@ -17,7 +17,7 @@ public function testIssueComment($eventHeader, $payloadFilename, $expectedRespon
         $response = $client->getResponse();
 
         $responseData = json_decode($response->getContent(), true);
-        $this->assertSame(200, $response->getStatusCode());
+        $this->assertSame(200, $response->getStatusCode(), isset($responseData['error']) ? $responseData['error'] : 'An error occurred.');
 
         // a weak sanity check that we went down "the right path" in the controller
         $this->assertSame($expectedResponse, $responseData);
