notid/integreat
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

minor cleanup.

Browse Source
This commit is contained in:
Bryce
2023-10-30 21:01:34 -07:00
parent 3d5c307760
commit 1f48970200
2 changed files with 16 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/clj/auto_ap/handler.clj
View File

@@ -125,6 +125,8 @@
:route (:handler (bidi.bidi/match-route all-routes :route (:handler (bidi.bidi/match-route all-routes
(:uri request) (:uri request)
:request-method (:request-method request))) :request-method (:request-method request)))
:source "request"
:query (:uri request) :query (:uri request)
:request-method (:request-method request) :request-method (:request-method request)
:user (dissoc (:identity request) :user (dissoc (:identity request)
@@ -134,24 +136,18 @@
(not= "/api/graphql" (:uri request)) (not= "/api/graphql" (:uri request))
(assoc :query-params (:query-params request))) (assoc :query-params (:query-params request)))
(mu/trace ::http-request-trace (mu/trace ::http-request-trace
[] {:pairs []
(mu/with-context {:uri (:uri request) :capture (fn [r] {:status (:status r)})}
:source "request" (when-not (str/includes? (:uri request) "health-check")
:user-role (:user/role (:identity request)) (alog/info ::http-request-starting))
:user-name (:user/name (:identity request))} (try
(let [response (handler request)]
response)
(when-not (str/includes? (:uri request) "health-check") (catch Exception e
(alog/info ::http-request-starting)) (alog/error ::request-error
(try :status 500
(let [response (handler request)] :exception e)
(alog/info ::http-request-done (throw e)))))))
:status-code (:status response))
response)
(catch Exception e
(alog/error ::request-error
:exception e)
(throw e))))))))
(defn wrap-idle-session-timeout (defn wrap-idle-session-timeout
[handler ] [handler ]

25
src/clj/auto_ap/ssr/utils.clj
View File

@@ -46,31 +46,7 @@
(assoc-in [:headers "hx-retarget"] "#modal-content") (assoc-in [:headers "hx-retarget"] "#modal-content")
(assoc-in [:headers "hx-reswap"] "innerHTML")))))) (assoc-in [:headers "hx-reswap"] "innerHTML"))))))
(defn wrap-error-response [handler]
(fn [request]
(try
(handler request)
(catch Exception e
(if-let [v (or (:validation-error (ex-data e))
(:validation-error (ex-data (.getCause e))))]
(do
(alog/warn ::request-validation-error
:exception e)
(html-response
[:div.notification.is-warning.is-light
v]
:status 400))
(do
(alog/error ::request-error
:exception e)
(when (= "dev" (:dd-env env))
(println e))
(html-response
[:div.notification.is-danger.is-light
"Server error occured."
(ex-message e)]
:status 500)))))))
(defn form-data->map [form-data] (defn form-data->map [form-data]
(reduce-kv (reduce-kv
@@ -229,6 +205,7 @@
query-schema query-schema
query-params query-params
main-transformer))) main-transformer)))
(catch Exception e (catch Exception e
(alog/warn ::validation-error :error e) (alog/warn ::validation-error :error e)
(throw (ex-info (->> (-> e (throw (ex-info (->> (-> e