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

Merge pull request #254 from vielmath/pedestal-error-arity

Browse source 
Support Sieppari-style error handlers with pedestal
This commit is contained in:
Tommi Reiman 2019-04-12 19:36:19 +03:00 committed by GitHub
commit 21c58d53ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
modules/reitit-pedestal/src/reitit/pedestal.clj
View file

@ -6,6 +6,29 @@
[reitit.http])
(:import (reitit.interceptor Executor)))
(defn- arity [f]
(->> (class f)
.getDeclaredMethods
(filter #(= "invoke" (.getName %)))
first
.getParameterTypes
alength))
(defn- error-with-arity-1? [{error-fn :error}]
(and error-fn (= 1 (arity error-fn))))
(defn- error-arity-2->1 [error]
(fn [context ex]
(let [{ex :error :as context} (error (assoc context :error ex))]
(if ex
(-> context
(assoc ::chain/error ex)
(dissoc :error))
context))))
(defn wrap-error-arity-2->1 [interceptor]
(update interceptor :error error-arity-2->1))
(def pedestal-executor
(reify
Executor
@ -13,7 +36,13 @@
(->> interceptors
(map (fn [{:keys [::interceptor/handler] :as interceptor}]
(or handler interceptor)))
(map interceptor/interceptor)))
(map (fn [interceptor]
(if (interceptor/interceptor? interceptor)
interceptor
(interceptor/interceptor
(if (error-with-arity-1? interceptor)
(wrap-error-arity-2->1 interceptor)
interceptor)))))))
(enqueue [_ context interceptors]
(chain/enqueue context interceptors))))