Makes logging unified

This commit is contained in:
2023-10-30 12:35:18 -07:00
parent f0a7c378f7
commit 930b900849
44 changed files with 485 additions and 555 deletions

View File

@@ -36,7 +36,6 @@
[ring.middleware.session :refer [wrap-session]]
[ring.middleware.session.cookie :refer [cookie-store]]
[ring.util.response :as response]
[unilog.context :as lc]
[clojure.set :as set]))
(when (:aws-access-key-id env)
@@ -122,20 +121,24 @@
(defn wrap-logging [handler]
(fn [request]
(mu/with-context {:uri (:uri request)
:query (:uri request)
:request-method (:request-method request)
:user (:identity request)
:user-role (:user/role (:identity request))
:user-name (:user/name (:identity request))
:query-params (:query-params request)}
(mu/with-context (cond-> {:uri (:uri request)
:route (:handler (bidi.bidi/match-route all-routes
(:uri request)
:request-method (:request-method request)))
:query (:uri request)
:request-method (:request-method request)
:user (dissoc (:identity request)
:gz-clients)
:user-role (:user/role (:identity request))
:user-name (:user/name (:identity request))}
(not= "/api/graphql" (:uri request))
(assoc :query-params (:query-params request)))
(mu/trace ::http-request-trace
[]
(lc/with-context {:uri (:uri request)
(mu/with-context {:uri (:uri request)
:source "request"
:user-role (:user/role (:identity request))
:user-name (:user/name (:identity request))
:query-params (:query-params request)}
:user-name (:user/name (:identity request))}
(when-not (str/includes? (:uri request) "health-check")
@@ -218,7 +221,7 @@
(pull-many (dc/db conn)
d-clients/full-read))]
(lc/with-context {:clients (map :client/code clients)}
(mu/with-context {:clients (map :client/code clients)}
(handler (assoc request
:clients clients
:client (when (= 1 (count clients))