luciano/reitit
1
0
Fork 0
mirror of https://github.com/metosin/reitit.git synced 2025-12-16 16:01:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix exception log handler, *out* is Writer, not PrintWriter

Browse source 
*out* is usually OutputStreamWriter (set by clojure.lang.RT)
*out* could also be java.io.StringWriter (with-out-str)
This commit is contained in:
Juho Teperi 2021-03-11 21:57:15 +02:00
parent 349c838de4
commit 0d71141b55
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
modules/reitit-interceptors/src/reitit/http/interceptors/exception.clj
View file

@ -4,7 +4,7 @@
[clojure.spec.alpha :as s]
[clojure.string :as str])
(:import (java.time Instant)
(java.io PrintWriter)))
(java.io PrintWriter Writer)))
(s/def ::handlers (s/map-of any? fn?))
(s/def ::spec (s/keys :opt-un [::handlers]))
@ -35,7 +35,7 @@
(wrap error-handler error request)
(error-handler error request))))
(defn print! [^PrintWriter writer & more]
(defn print! [^Writer writer & more]
(.write writer (str (str/join " " more) "\n")))
;;
@ -68,7 +68,7 @@
(defn wrap-log-to-console [handler ^Throwable e {:keys [uri request-method] :as req}]
(print! *out* (Instant/now) request-method (pr-str uri) "=>" (.getMessage e))
(.printStackTrace e ^PrintWriter *out*)
(.printStackTrace e (PrintWriter. ^Writer *out*))
(handler e req))
;;

6
modules/reitit-middleware/src/reitit/ring/middleware/exception.clj
View file

@ -4,7 +4,7 @@
[clojure.spec.alpha :as s]
[clojure.string :as str])
(:import (java.time Instant)
(java.io PrintWriter)))
(java.io Writer PrintWriter)))
(s/def ::handlers (s/map-of any? fn?))
(s/def ::spec (s/keys :opt-un [::handlers]))
@ -55,7 +55,7 @@
(catch Throwable e
(on-exception handlers e request respond raise)))))))
(defn print! [^PrintWriter writer & more]
(defn print! [^Writer writer & more]
(.write writer (str (str/join " " more) "\n")))
;;
@ -88,7 +88,7 @@
(defn wrap-log-to-console [handler ^Throwable e {:keys [uri request-method] :as req}]
(print! *out* (Instant/now) request-method (pr-str uri) "=>" (.getMessage e))
(.printStackTrace e ^PrintWriter *out*)
(.printStackTrace e (PrintWriter. ^Writer *out*))
(handler e req))
;;