Merge pull request #96 from FriendsOfSymfony/debug-info-on-error

debug information in exceptions

Author: ddeboer

src/Exception/ProxyResponseException.php

@@ -19,22 +19,23 @@ class ProxyResponseException extends \RuntimeException implements HttpCacheExcep
     /**
      * @param string     $host          The host name that was contacted.
      * @param string     $statusCode    The status code of the reply.
-     * @param string     $statusMessage The content of the reply.
-     * @param \Exception $previous      The exception from guzzle.
+     * @param string     $statusMessage The error message.
+     * @param string     $details  Further details about the request that caused the error.
+     * @param \Exception $previous      The exception from the HTTP client.
      *
      * @return ProxyUnreachableException
      */
-    public static function proxyResponse($host, $statusCode, $statusMessage, \Exception $previous = null)
+    public static function proxyResponse($host, $statusCode, $statusMessage, $details = '', \Exception $previous = null)
     {
-        return new ProxyResponseException(
-            sprintf(
-                '%s error response "%s" from caching proxy at %s',
-                $statusCode,
-                $statusMessage,
-                $host
-            ),
+        $message = sprintf(
+            '%s error response "%s" from caching proxy at %s',
             $statusCode,
-            $previous
+            $statusMessage,
+            $host
         );
+        if ($details) {
+            $message .= ". $details";
+        }
+        return new ProxyResponseException($message, $statusCode, $previous);
     }
 }

src/Exception/ProxyUnreachableException.php

@@ -19,19 +19,25 @@ class ProxyUnreachableException extends \RuntimeException implements HttpCacheEx
 {
     /**
      * @param string     $host     The host name that was contacted.
-     * @param string     $message  The error message from guzzle.
-     * @param \Exception $previous The exception from guzzle.
+     * @param string     $message  The error message from the HTTP client.
+     * @param string     $details  Further details about the request that caused the error.
+     * @param \Exception $previous The exception from the HTTP client.
      *
      * @return ProxyUnreachableException
      */
-    public static function proxyUnreachable($host, $message, \Exception $previous = null)
+    public static function proxyUnreachable($host, $message, $details = '', \Exception $previous = null)
     {
+        $message = sprintf(
+            'Request to caching proxy at %s failed with message "%s"',
+            $host,
+            $message
+        );
+        if ($details) {
+            $message .= ". $details";
+        }
+
         return new ProxyUnreachableException(
-            sprintf(
-                'Request to caching proxy at %s failed with message "%s"',
-                $host,
-                $message
-            ),
+            $message,
             0,
             $previous
         );

src/ProxyClient/AbstractProxyClient.php

@@ -195,6 +195,7 @@ protected function handleException(MultiTransferException $exceptions)
                 $e = ProxyUnreachableException::proxyUnreachable(
                     $exception->getRequest()->getHost(),
                     $exception->getMessage(),
+                    $exception->getRequest()->getRawHeaders(),
                     $exception
                 );
             } elseif ($exception instanceof RequestException) {
@@ -203,6 +204,7 @@ protected function handleException(MultiTransferException $exceptions)
                     $exception->getRequest()->getHost(),
                     $exception->getCode(),
                     $exception->getMessage(),
+                    $exception->getRequest()->getRawHeaders(),
                     $exception
                 );
             } else {