replce deref of server with aleph.netty/wait-for-close, and make cont…

…rol-period for connection-pools configurable, fixes #246

project.clj

@@ -1,4 +1,4 @@
-(defproject aleph "0.4.2-alpha3"
+(defproject aleph "0.4.2-alpha4"
   :description "a framework for asynchronous communication"
   :repositories {"jboss" "http://repository.jboss.org/nexus/content/groups/public/"
                  "sonatype-oss-public" "https://oss.sonatype.org/content/groups/public/"}

src/aleph/http.clj

@@ -103,10 +103,12 @@
            connection-options
            stats-callback
            response-executor
+           control-period
            middleware]
     :or {connections-per-host 8
          total-connections 1024
          target-utilization 0.9
+         control-period 60000
          response-executor default-response-executor
          middleware middleware/wrap-request}}]
   (let [p (promise)
@@ -126,6 +128,7 @@
                            (d/chain' c
                              first
                              client/close-connection))
+                :control-period control-period
                 :controller (Pools/utilizationController
                               target-utilization
                               connections-per-host

src/aleph/netty.clj

@@ -610,7 +610,8 @@
 ;;;
 
 (defprotocol AlephServer
-  (port [_] "Returns the port the server is listening on."))
+  (port [_] "Returns the port the server is listening on.")
+  (wait-for-close [_] "Blocks until the server has been closed."))
 
 (defn epoll-available? []
   (Epoll/isAvailable))
@@ -725,14 +726,13 @@
             (when on-close (on-close))
             (-> ch .close .sync)
             (-> group .shutdownGracefully))
-          clojure.lang.IDeref
-          (deref [_]
-            (-> ch .closeFuture .await)
-            (-> group .terminationFuture .await)
-            nil)
           AlephServer
           (port [_]
-            (-> ch .localAddress .getPort))))
+            (-> ch .localAddress .getPort))
+          (wait-for-close [_]
+            (-> ch .closeFuture .await)
+            (-> group .terminationFuture .await)
+            nil)))
 
       (catch Exception e
         @(.shutdownGracefully group)

test/aleph/http_test.clj

@@ -148,7 +148,7 @@
          (finally
            (.close ^java.io.Closeable server#)
            (.shutdown *pool*)
-           @server#)))))
+           (netty/wait-for-close server#))))))
 
 (defmacro with-handler [handler & body]
   `(with-server (http/start-server ~handler {:port port})