Improve logging flow when replaying request. No functional change

Author: jfarcand

src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java

@@ -276,7 +276,7 @@ private Channel lookupInCache(URI uri) {
         final Channel channel = connectionsPool.poll(AsyncHttpProviderUtils.getBaseUrl(uri));
 
         if (channel != null) {
-            log.debug("Using cached Channel {} for uri {}", channel, uri);
+            log.debug("Using cached Channel {}\n for uri {}\n", channel, uri);
 
             try {
                 // Always make sure the channel who got cached support the proper protocol. It could
@@ -748,7 +748,7 @@ private <T> Future<T> doConnect(final Request request, final AsyncHandler<T> asy
             f.setState(NettyResponseFuture.STATE.POOLED);
             f.attachChannel(channel, false);
 
-            log.debug("\n\nCached Request {}\n", channel);
+            log.debug("\nUsing cached Channel {}\n for request {}\n", channel, request);
             channel.getPipeline().getContext(NettyAsyncHttpProvider.class).setAttachment(f);
 
             try {
@@ -765,8 +765,6 @@ private <T> Future<T> doConnect(final Request request, final AsyncHandler<T> asy
             return f;
         }
 
-        log.debug("\n\nNon cached Request {}\n", request);
-
         if (!connectionsPool.canCacheConnection() ||
                 (config.getMaxTotalConnections() > -1 && (maxConnections.get() + 1) > config.getMaxTotalConnections())) {
             throw new IOException(String.format("Too many connections %s", config.getMaxTotalConnections()));
@@ -825,6 +823,8 @@ private <T> Future<T> doConnect(final Request request, final AsyncHandler<T> asy
             channelFuture.addListener(c);
         }
 
+        log.debug("\n\nNon cached Request {}\n with channel {}\n", request, channel);
+
         if (!c.future().isCancelled() || !c.future().isDone()) {
             openChannels.add(channelFuture.getChannel());
             c.future().attachChannel(channelFuture.getChannel(), false);
@@ -1293,7 +1293,7 @@ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws
             exception = ex;
         }
 
-        log.debug("Channel Closed: {}", e.getChannel());
+        log.debug("Channel Closed: {} with attachment {}", e.getChannel(), ctx.getAttachment());
 
         if (ctx.getAttachment() instanceof AsyncCallable) {
             AsyncCallable ac = (AsyncCallable) ctx.getAttachment();
@@ -1342,21 +1342,21 @@ protected boolean remotelyClosed(Channel channel, NettyResponseFuture<?> future)
         }
 
         if (future == null || future.cannotBeReplay()) {
-            log.debug("Unable to replay request {} associated with future", future == null ? "" : future.getNettyRequest(), future);
+            log.debug("Unable to replay request {}\n associated with future {}\n", future == null ? "null" : future.getNettyRequest(), future);
             return false;
         }
 
         future.setState(NettyResponseFuture.STATE.RECONNECTED);
 
-        log.debug("Trying to recover request {}", future.getNettyRequest());
+        log.debug("Trying to recover request {}\n", future.getNettyRequest());
 
         try {
             nextRequest(future.getRequest(), future);
             return true;
         } catch (IOException iox) {
             future.setState(NettyResponseFuture.STATE.CLOSED);
             future.abort(iox);
-            log.error("Remotely Closed", iox);
+            log.error("Remotely Closed, unable to recover", iox);
         }
         return false;
     }
@@ -1453,7 +1453,7 @@ public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e)
                 }
 
                 if (abortOnReadCloseException(cause) || abortOnWriteCloseException(cause)) {
-                    log.debug("Trying to recover from dead Channel: {}", channel);
+                    log.debug("Trying to recover from dead Channel: {}\n request {}", channel, future.getNettyRequest());
                     if (remotelyClosed(channel, future)) {
                         return;
                     }
@@ -1724,7 +1724,7 @@ public synchronized void run() {
             }
 
             if (this.nettyResponseFuture != null && this.nettyResponseFuture.hasExpired()) {
-                log.debug("Request Timeout expired for {}", this.nettyResponseFuture);
+                log.debug("Request Timeout expired for {}\n", this.nettyResponseFuture);
 
                 int requestTimeout = config.getRequestTimeoutInMs();
                 PerRequestConfig p = this.nettyResponseFuture.getRequest().getPerRequestConfig();