Merge pull request #182 from brharrington/wire-logging

add flags for enabling wire logging
Netflix · Oct 19, 2015 · 0fc9f93 · 0fc9f93
2 parents ac82a3c + d4e1a31
commit 0fc9f93
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/iep-rxhttp/src/main/java/com/netflix/iep/http/ClientConfig.java b/iep-rxhttp/src/main/java/com/netflix/iep/http/ClientConfig.java
@@ -15,6 +15,7 @@
  */
 package com.netflix.iep.http;
 
+import io.netty.handler.logging.LogLevel;
 import org.apache.commons.configuration.Configuration;
 
 import java.net.URI;
@@ -197,6 +198,20 @@ boolean gzipEnabled() {
     return getBoolean("GzipEnabled", true);
   }
 
+  /**
+   * Should detailed wire logging be enabled on the underlying client?
+   */
+  boolean wireLoggingEnabled() {
+    return getBoolean("WireLoggingEnabled", false);
+  }
+
+  /**
+   * Log level to use for logging events.
+   */
+  LogLevel wireLoggingLevel() {
+    return LogLevel.valueOf(getString("WireLoggingLevel", "ERROR"));
+  }
+
   /** Max number of retries. */
   int numRetries() {
     return getInt("MaxAutoRetriesNextServer", 2);

diff --git a/iep-rxhttp/src/main/java/com/netflix/iep/http/RxHttp.java b/iep-rxhttp/src/main/java/com/netflix/iep/http/RxHttp.java
@@ -599,6 +599,10 @@ private HttpClient<ByteBuf, ByteBuf> newClient(final RequestContext context) {
             .withName(clientCfg.name())
             .channelOption(ChannelOption.CONNECT_TIMEOUT_MILLIS, clientCfg.connectTimeout());
 
+    if (clientCfg.wireLoggingEnabled()) {
+      builder.enableWireLogging(clientCfg.wireLoggingLevel());
+    }
+
     final int idleTimeout = clientCfg.idleConnectionsTimeoutMillis();
     if (idleTimeout == 0) {
       builder.withNoConnectionPooling();