Make timeout exception messages more constant

Author: Stephane Landelle

src/main/java/com/ning/http/client/providers/netty/timeout/IdleConnectionTimeoutTimerTask.java

@@ -50,7 +50,7 @@ public void run(Timeout timeout) throws Exception {
             if (durationBeforeCurrentIdleConnectionTimeout <= 0L) {
                 // idleConnectionTimeout reached
                 long durationSinceLastTouch = now - nettyResponseFuture.getLastTouch();
-                expire("Connection reached idle timeout of " + idleConnectionTimeout + " ms after " + durationSinceLastTouch + " ms");
+                expire("Idle connection timeout of " + idleConnectionTimeout + " ms", durationSinceLastTouch);
                 nettyResponseFuture.setIdleConnectionTimeoutReached();
 
             } else if (currentIdleConnectionTimeoutInstant < requestTimeoutInstant) {

src/main/java/com/ning/http/client/providers/netty/timeout/RequestTimeoutTimerTask.java

@@ -38,7 +38,7 @@ public void run(Timeout timeout) throws Exception {
         }
 
         if (!nettyResponseFuture.isDone() && !nettyResponseFuture.isCancelled()) {
-            expire("Request reached timeout of " + nettyResponseFuture.getRequestTimeoutInMs() + " ms after " + (millisTime() - nettyResponseFuture.getStart()) + " ms");
+            expire("Request timeout of " + nettyResponseFuture.getRequestTimeoutInMs() + " ms", millisTime() - nettyResponseFuture.getStart());
             nettyResponseFuture.setRequestTimeoutReached();
         }
     }

src/main/java/com/ning/http/client/providers/netty/timeout/TimeoutTimerTask.java

@@ -38,8 +38,8 @@ public TimeoutTimerTask(NettyResponseFuture<?> nettyResponseFuture, NettyAsyncHt
         this.timeoutsHolder = timeoutsHolder;
     }
 
-    protected void expire(String message) {
-        LOGGER.debug("{} for {}", message, nettyResponseFuture);
+    protected void expire(String message, long time) {
+        LOGGER.debug("{} for {} after {} ms", message, nettyResponseFuture, time);
         provider.abort(nettyResponseFuture, new TimeoutException(message));
     }
 }