From db252cd0af9dfeb62c9a000372f6a13488b3009e Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Thu, 5 Nov 2009 13:32:14 +0000
Subject: [PATCH] SPR-6303 - Add more logging to RestTemplate

---
 .../web/client/RestTemplate.java              | 32 +++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java b/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
index ae5945343e..8b464aeadf 100644
--- a/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
+++ b/org.springframework.web/src/main/java/org/springframework/web/client/RestTemplate.java
@@ -382,8 +382,11 @@ public class RestTemplate extends HttpAccessor implements RestOperations {
 				requestCallback.doWithRequest(request);
 			}
 			response = request.execute();
-			if (getErrorHandler().hasError(response)) {
-				getErrorHandler().handleError(response);
+			if (!getErrorHandler().hasError(response)) {
+				logResponseStatus(method, url, response);
+			}
+			else {
+				handleResponseError(method, url, response);
 			}
 			if (responseExtractor != null) {
 				return responseExtractor.extractData(response);
@@ -419,6 +422,31 @@ public class RestTemplate extends HttpAccessor implements RestOperations {
 		throw new IllegalArgumentException("Could not resolve HttpMessageConverter for [" + type.getName() + "]");
 	}
 
+	private void logResponseStatus(HttpMethod method, URI url, ClientHttpResponse response) {
+		if (logger.isDebugEnabled()) {
+			try {
+				logger.debug(method.name() + " request for \"" + url + "\" resulted in " + response.getStatusCode() +
+						" (" + response.getStatusText() + ")");
+			}
+			catch (IOException e) {
+				// ignore
+			}
+		}
+	}
+
+	private void handleResponseError(HttpMethod method, URI url, ClientHttpResponse response) throws IOException {
+		if (logger.isWarnEnabled()) {
+			try {
+				logger.warn(method.name() + " request for \"" + url + "\" resulted in " + response.getStatusCode() +
+						" (" + response.getStatusText() + "); invoking error handler");
+			}
+			catch (IOException e) {
+				// ignore
+			}
+		}
+		getErrorHandler().handleError(response);
+	}
+
 	/** Request callback implementation that prepares the request's accept headers. */
 	private class AcceptHeaderRequestCallback<T> implements RequestCallback {