svn commit: r1539399 - /httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java

[ol...@apache.org]

Author: olegk
Date: Wed Nov  6 17:04:21 2013
New Revision: 1539399

URL: http://svn.apache.org/r1539399
Log:
HTTPCLIENT-1429: truncate long cookie values in WARN logs

Modified:
    httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java

Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java?rev=1539399&r1=1539398&r2=1539399&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java Wed Nov  6 17:04:21 2013
@@ -114,13 +114,12 @@ public class ResponseProcessCookies impl
                         cookieStore.addCookie(cookie);
 
                         if (this.log.isDebugEnabled()) {
-                            this.log.debug("Cookie accepted: \""
-                                    + cookie + "\". ");
+                            this.log.debug("Cookie accepted [" + formatCooke(cookie) + "]");
                         }
                     } catch (final MalformedCookieException ex) {
                         if (this.log.isWarnEnabled()) {
-                            this.log.warn("Cookie rejected: \""
-                                    + cookie + "\". " + ex.getMessage());
+                            this.log.warn("Cookie rejected [" + formatCooke(cookie) + "] "
+                                    + ex.getMessage());
                         }
                     }
                 }
@@ -133,4 +132,25 @@ public class ResponseProcessCookies impl
         }
     }
 
+    private static String formatCooke(final Cookie cookie) {
+        final StringBuilder buf = new StringBuilder();
+        buf.append(cookie.getName());
+        buf.append("=\"");
+        String v = cookie.getValue();
+        if (v.length() > 100) {
+            v = v.substring(0, 100) + "...";
+        }
+        buf.append(v);
+        buf.append("\"");
+        buf.append(", version:");
+        buf.append(Integer.toString(cookie.getVersion()));
+        buf.append(", domain:");
+        buf.append(cookie.getDomain());
+        buf.append(", path:");
+        buf.append(cookie.getPath());
+        buf.append(", expiry:");
+        buf.append(cookie.getExpiryDate());
+        return buf.toString();
+    }
+
 }