android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-27 18:21:14 +03:00
Code Releases Activity

Don't log gzipped data. It isn't human readable.

Browse Source
This commit is contained in:
jwilson
2015-12-03 23:57:42 -05:00
parent c09c5c1b41
commit c071f6fef4
2 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
okhttp-logging-interceptor/src/main/java/com/squareup/okhttp/logging/HttpLoggingInterceptor.java
View File

@@ -178,8 +178,11 @@ public final class HttpLoggingInterceptor implements Interceptor {
}
}
String endMessage = "--> END " + request.method();
if (logBody && hasRequestBody) {
if (!logBody || !hasRequestBody) {
logger.log("--> END " + request.method());
} else if (bodyEncoded(request.headers())) {
logger.log("--> END " + request.method() + " (encoded body omitted)");
} else {
Buffer buffer = new Buffer();
requestBody.writeTo(buffer);
@@ -192,9 +195,9 @@ public final class HttpLoggingInterceptor implements Interceptor {
logger.log("");
logger.log(buffer.readString(charset));
endMessage += " (" + requestBody.contentLength() + "-byte body)";
logger.log("--> END " + request.method()
+ " (" + requestBody.contentLength() + "-byte body)");
}
logger.log(endMessage);
}
long startNs = System.nanoTime();
@@ -212,8 +215,11 @@ public final class HttpLoggingInterceptor implements Interceptor {
logger.log(headers.name(i) + ": " + headers.value(i));
}
String endMessage = "<-- END HTTP";
if (logBody && HttpEngine.hasBody(response)) {
if (!logBody || !HttpEngine.hasBody(response)) {
logger.log("<-- END HTTP");
} else if (bodyEncoded(response.headers())) {
logger.log("<-- END HTTP (encoded body omitted)");
} else {
BufferedSource source = responseBody.source();
source.request(Long.MAX_VALUE); // Buffer the entire body.
Buffer buffer = source.buffer();
@@ -229,14 +235,18 @@ public final class HttpLoggingInterceptor implements Interceptor {
logger.log(buffer.clone().readString(charset));
}
endMessage += " (" + buffer.size() + "-byte body)";
logger.log("<-- END HTTP (" + buffer.size() + "-byte body)");
}
logger.log(endMessage);
}
return response;
}
private boolean bodyEncoded(Headers headers) {
String contentEncoding = headers.get("Content-Encoding");
return contentEncoding != null && !contentEncoding.equalsIgnoreCase("identity");
}
private static String protocol(Protocol protocol) {
return protocol == Protocol.HTTP_1_0 ? "HTTP/1.0" : "HTTP/1.1";
}