From 736b978ede727b95cb76572ce9e61fd24ed16e95 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 16 Feb 2012 18:22:09 +0000
Subject: [PATCH] Improve error log formatting and added error message info for
 InvalidResponseException

---
 includes/filerepo/backend/SwiftFileBackend.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/filerepo/backend/SwiftFileBackend.php b/includes/filerepo/backend/SwiftFileBackend.php
index e2c5986801..734a06a395 100644
--- a/includes/filerepo/backend/SwiftFileBackend.php
+++ b/includes/filerepo/backend/SwiftFileBackend.php
@@ -807,7 +807,11 @@ class SwiftFileBackend extends FileBackendStore {
 	 */
 	protected function logException( Exception $e, $func, array $params ) {
 		wfDebugLog( 'SwiftBackend',
-			get_class( $e ) . " in '{$this->name}': '{$func}' with " . serialize( $params ) 
+			get_class( $e ) . " in '{$func}' (given '" . serialize( $params ) . "')" .
+			( $e instanceof InvalidResponseException
+				? ": {$e->getMessage()}"
+				: ""
+			)
 		);
 	}
 }
-- 
2.20.1