Merge pull request #444 from Whoops/thread-pool

Add :thread-pool option to run-jetty

Author: weavejester

ring-jetty-adapter/src/ring/adapter/jetty.clj

@@ -148,7 +148,8 @@
     pool))
 
 (defn- ^Server create-server [options]
-  (let [server (Server. (create-threadpool options))]
+  (let [pool   (or (:thread-pool options) (create-threadpool options))
+        server (Server. pool)]
     (when (:http? options true)
       (.addConnector server (http-connector server options)))
     (when (or (options :ssl?) (options :ssl-port))
@@ -189,6 +190,7 @@
   :key-password           - the password to the keystore
   :keystore-scan-interval - if not nil, the interval in seconds to scan for an
                             updated keystore
+  :thread-pool            - custom thread pool instance for Jetty to use
   :truststore             - a truststore to use for SSL connections
   :trust-password         - the password to the truststore
   :max-threads            - the maximum number of threads to use (default 50)

ring-jetty-adapter/test/ring/adapter/test/jetty.clj

@@ -290,6 +290,14 @@
       (is (= 1000 (. thread-pool getIdleTimeout)))
       (.stop server)))
 
+  (testing "providing custom thread-pool"
+    (let [pool   (QueuedThreadPool.)
+          server (run-jetty hello-world {:port test-port
+                                         :join? false
+                                         :thread-pool pool})]
+      (is (identical? pool (.getThreadPool server)))
+      (.stop server)))
+
   (testing "default character encoding"
     (with-server (content-type-handler "text/plain") {:port test-port}
       (let [response (http/get test-url)]