merged branch webfactory/pass-excpetions-to-monolog (PR #8000)

fabpot · fabpot · commit 31138f4474ed · 2013-05-10T11:42:13.000+02:00
This PR was squashed before being merged into the master branch (closes #8000). Discussion ---------- Pass exceptions from the ExceptionListener to Monolog | Q | A | ------------- | --- | Bug fix? | rather yes | New feature? | rather no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #7973, #7976 | License | MIT | Doc PR | n/a Pass exceptions caught by the ExceptionListener to Monolog, using the log message context. As of Monolog 1.5, exceptions passed that way will at least be logged with the line they were thrown in, also including any previous exceptions. Getting full stack traces (as suggested in #7976) becomes a possible change at the Monolog level (see Seldaek/monolog#192) or users can add their own Monolog Formatter for that. This PR is based on master. I'd be glad to provide similar ones for 2.1/2.2 if you'd pick them. Due to recent changes in the ExceptionListener I don't think a single patch on the older branches can easily be pulled to master anyway. Commits ------- 97bee20 Pass exceptions from the ExceptionListener to Monolog
diff --git a/src/Symfony/Component/HttpKernel/CHANGELOG.md b/src/Symfony/Component/HttpKernel/CHANGELOG.md
@@ -10,6 +10,8 @@ CHANGELOG
  * deprecated `Symfony\Component\HttpKernel\Kernel::init()``
  * added the possibility to specify an id an extra attributes to hinclude tags
  * added the collect of data if a controller is a Closure in the Request collector
+ * pass exceptions from the ExceptionListener to the logger using the logging context to allow for more
+   detailed messages
 
 2.2.0
 -----
diff --git a/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php b/src/Symfony/Component/HttpKernel/EventListener/ExceptionListener.php
@@ -95,11 +95,12 @@ public static function getSubscribedEvents()
     protected function logException(\Exception $exception, $message, $original = true)
     {
         $isCritical = !$exception instanceof HttpExceptionInterface || $exception->getStatusCode() >= 500;
+        $context = array('exception' => $exception);
         if (null !== $this->logger) {
             if ($isCritical) {
-                $this->logger->critical($message);
+                $this->logger->critical($message, $context);
             } else {
-                $this->logger->error($message);
+                $this->logger->error($message, $context);
             }
         } elseif (!$original || $isCritical) {
             error_log($message);
