Wrap Netty's ConnectTimeoutException in our ConnectionTimeoutException

This should make callers' lives a little easier...

Author: DerGuteMoritz

src/aleph/http.clj

@@ -22,6 +22,7 @@
       ReadTimeoutException
       RequestTimeoutException)
     (io.aleph.dirigiste Pools)
+    (io.netty.channel ConnectTimeoutException)
     (io.netty.handler.codec Headers)
     (io.netty.handler.codec.http HttpHeaders)
     (java.net
@@ -384,18 +385,18 @@
                          (maybe-timeout! connection-timeout)
 
                          ;; connection timeout triggered, dispose of the connetion
-                         (d/catch' TimeoutException
-                           (fn [^Throwable e]
-                             (log/error e "Timed out waiting for connection to be established")
-                             (flow/dispose pool k conn)
-                             (d/error-deferred (ConnectionTimeoutException. e))))
-
-                         ;; connection failed, bail out
                          (d/catch'
                            (fn [e]
-                             (log/error e "Connection failure")
                              (flow/dispose pool k conn)
-                             (d/error-deferred e)))
+                             (if (or (instance? TimeoutException e)
+                                     ;; Unintuitively, this type doesn't inherit from TimeoutException
+                                     (instance? ConnectTimeoutException e))
+                               (do
+                                 (log/error e "Timed out waiting for connection to be established")
+                                 (d/error-deferred (ConnectionTimeoutException. ^Throwable e)))
+                               (do
+                                 (log/error e "Connection failure")
+                                 (d/error-deferred e)))))
 
                          ;; actually make the request now
                          (d/chain'

test/aleph/http_test.clj

@@ -29,8 +29,7 @@
       ChannelHandlerContext
       ChannelOutboundHandlerAdapter
       ChannelPipeline
-      ChannelPromise
-      ConnectTimeoutException)
+      ChannelPromise)
     (io.netty.handler.codec TooLongFrameException)
     (io.netty.handler.codec.compression
       CompressionOptions
@@ -637,7 +636,7 @@
 (deftest test-pool-connect-timeout
   (binding [*connection-options* {:connect-timeout 2}]
     (with-handler basic-handler
-      (is (thrown? ConnectTimeoutException
+      (is (thrown? ConnectionTimeoutException
                    (deref (http/get "http://192.0.2.0" ;; "TEST-NET" in RFC 5737
                                     (merge (default-request-options) {:pool *pool*
                                                                       :connection-timeout 500}))