Improve logging, remove unnessary use of cast

jfarcand · jfarcand · commit c92f53e678f5 · 2011-02-21T10:54:39.000-05:00
diff --git a/pom.xml b/pom.xml
@@ -80,7 +80,6 @@
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
             <version>0.9.26</version>
-            <scope>test</scope>
         </dependency>       
         <dependency>
             <groupId>log4j</groupId>
diff --git a/src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java b/src/main/java/com/ning/http/client/providers/netty/NettyAsyncHttpProvider.java
@@ -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 using Channel {}", request, channelFuture.getChannel());
+
         if (!c.future().isCancelled() || !c.future().isDone()) {
             openChannels.add(channelFuture.getChannel());
             c.future().attachChannel(channelFuture.getChannel(), false);
@@ -1252,7 +1252,7 @@ private void abort(NettyResponseFuture<?> future, Throwable t) {
             openChannels.remove(future.channel());
         }
 
-        log.debug("aborting Future {}", future);
+        log.debug("aborting Future {}\n", future);
         log.debug(t.getMessage(), t);
 
         future.abort(t);
@@ -1293,7 +1293,7 @@ public void channelClosed(ChannelHandlerContext ctx, ChannelStateEvent e) throws
             exception = ex;
         }
 
-        log.debug("Channel Closed: {}", e.getChannel());
+        log.debug("Channel Closed: {}\n with attachment {}\n", e.getChannel(), ctx.getAttachment());
 
         if (ctx.getAttachment() instanceof AsyncCallable) {
             AsyncCallable ac = (AsyncCallable) ctx.getAttachment();
@@ -1334,15 +1334,13 @@ protected boolean remotelyClosed(Channel channel, NettyResponseFuture<?> future)
 
         connectionsPool.removeAll(channel);
 
-        if (future == null && channel.getPipeline().getContext(NettyAsyncHttpProvider.class).getAttachment() != null
-                && NettyResponseFuture.class.isAssignableFrom(
-                channel.getPipeline().getContext(NettyAsyncHttpProvider.class).getAttachment().getClass())) {
+        if (future == null) {
             future = (NettyResponseFuture<?>)
                     channel.getPipeline().getContext(NettyAsyncHttpProvider.class).getAttachment();
         }
 
         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 {}", future == null ? "null" : future.getNettyRequest(), future);
             return false;
         }
 
@@ -1453,7 +1451,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 request {}\n from dead Channel: {}\n", channel);
                     if (remotelyClosed(channel, future)) {
                         return;
                     }
@@ -1724,7 +1722,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();
