gered/ring-custom-jetty-server
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #21 from magnars/custom-stacktrace-middleware

Browse source 
Support custom stacktrace middleware
This commit is contained in:
James Reeves 2014-10-14 20:32:10 +01:00
parent b49a910fcb cffbe02375
commit 81d027d382
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ring/server/leiningen.clj
View file

@ -17,4 +17,5 @@
(:ring project) (:ring project)
(-> project :ring :adapter) (-> project :ring :adapter)
{:init (load-var (-> project :ring :init)) {:init (load-var (-> project :ring :init))
:destroy (load-var (-> project :ring :destroy))}))) :destroy (load-var (-> project :ring :destroy))
:stacktrace-middleware (load-var (-> project :ring :stacktrace-middleware))})))

24
src/ring/server/standalone.clj
View file

@ -52,7 +52,8 @@
(defn- add-stacktraces [handler options] (defn- add-stacktraces [handler options]
(if (stacktraces? options) (if (stacktraces? options)
(wrap-stacktrace handler) ((or (:stacktrace-middleware options)
wrap-stacktrace) handler)
handler)) handler))
(defn- add-auto-reload [handler options] (defn- add-auto-reload [handler options]
@ -73,16 +74,17 @@
(defn serve (defn serve
"Start a web server to run a handler. Takes the following options: "Start a web server to run a handler. Takes the following options:
:port - the port to run the server on :port - the port to run the server on
:join? - if true, wait for the server to stop :join? - if true, wait for the server to stop
:init - a function to run before the server starts :init - a function to run before the server starts
:destroy - a function to run after the server stops :destroy - a function to run after the server stops
:open-browser? - if true, open a web browser after the server starts :open-browser? - if true, open a web browser after the server starts
:browser-uri - the path to browse to when opening a browser :browser-uri - the path to browse to when opening a browser
:stacktraces? - if true, display stacktraces when an exception is thrown :stacktraces? - if true, display stacktraces when an exception is thrown
:auto-reload? - if true, automatically reload source files :stacktrace-middleware - a middleware that handles stacktraces
:reload-paths - seq of src-paths to reload on change - defaults to [\"src\"] :auto-reload? - if true, automatically reload source files
:auto-refresh? - if true, automatically refresh browser when source changes :reload-paths - seq of src-paths to reload on change - defaults to [\"src\"]
:auto-refresh? - if true, automatically refresh browser when source changes
If join? is false, a Server object is returned." If join? is false, a Server object is returned."
{:arglists '([handler] [handler options])} {:arglists '([handler] [handler options])}

17
test/ring/server/test/standalone.clj
View file

@ -1,4 +1,4 @@
(ns ring.server.test.standalone (ns ring.server.test.standalone
(:use clojure.test (:use clojure.test
ring.server.standalone ring.server.standalone
ring.server.test.utils ring.server.test.utils
@ -25,7 +25,7 @@
(testing "PORT environment variable" (testing "PORT environment variable"
(with-env {"PORT" "4563"} (with-env {"PORT" "4563"}
(with-server (test-server) (with-server (test-server)
(is-server-running-on-port 4563)))) (is-server-running-on-port 4563))))
(testing ":port option" (testing ":port option"
@ -48,4 +48,15 @@
(with-server (test-server {:handler exception-handler}) (with-server (test-server {:handler exception-handler})
(let [body (:body (http-get 3000 ""))] (let [body (:body (http-get 3000 ""))]
(is (re-find #"java\.lang\.Exception" body)) (is (re-find #"java\.lang\.Exception" body))
(is (re-find #"testing" body)))))) (is (re-find #"testing" body)))))
(testing "custom stacktrace middleware"
(let [middleware (fn [handler]
(fn [req]
(try (handler req)
(catch Exception e
{:body "Hello"}))))]
(with-server (test-server {:handler exception-handler
:stacktrace-middleware middleware})
(is (= (:body (http-get 3000 ""))
"Hello"))))))