diff --git a/backend/resources/log4j2-devenv.xml b/backend/resources/log4j2-devenv.xml
index 1b9dba567..d07a33d7d 100644
--- a/backend/resources/log4j2-devenv.xml
+++ b/backend/resources/log4j2-devenv.xml
@@ -2,7 +2,7 @@
-
+
diff --git a/backend/scripts/repl b/backend/scripts/repl
index f2377e23d..3ca39aa9c 100755
--- a/backend/scripts/repl
+++ b/backend/scripts/repl
@@ -2,7 +2,6 @@
export PENPOT_FLAGS="enable-asserts enable-audit-log $PENPOT_FLAGS"
-#-J-Dlog4j2.contextSelector=org.apache.logging.log4j.core.async.AsyncLoggerContextSelector
export OPTIONS="
-A:jmx-remote:dev \
diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj
index 531f59727..fac709447 100644
--- a/backend/src/app/http/errors.clj
+++ b/backend/src/app/http/errors.clj
@@ -11,6 +11,7 @@
[app.common.logging :as l]
[app.common.uuid :as uuid]
[clojure.pprint]
+ [clojure.spec.alpha :as s]
[cuerdas.core :as str]))
(defn- parse-client-ip
@@ -23,22 +24,20 @@
[request error]
(let [data (ex-data error)]
(merge
- {:id (uuid/next)
- :path (:uri request)
- :method (:request-method request)
- :hint (or (:hint data) (ex-message error))
- :params (l/stringify-data (:params request))
- :data (l/stringify-data (dissoc data :explain))
- :ip-addr (parse-client-ip request)
- :profile-id (:profile-id request)}
+ {:id (uuid/next)
+ :path (:uri request)
+ :method (:request-method request)
+ :hint (or (:hint data) (ex-message error))
+ :params (l/stringify-data (:params request))
+ :spec-problems (some-> data ::s/problems)
+ :ip-addr (parse-client-ip request)
+ :profile-id (:profile-id request)}
(let [headers (:headers request)]
{:user-agent (get headers "user-agent")
:frontend-version (get headers "x-frontend-version" "unknown")})
- (when (map? data)
- {:error-type (:type data)
- :error-code (:code data)}))))
+ (dissoc data ::s/problems))))
(defmulti handle-exception
(fn [err & _rest]
@@ -66,17 +65,17 @@
(:explain edata)
"\n")}
{:status 400
- :body (dissoc edata :data)})))
+ :body (dissoc edata ::s/problems)})))
(defmethod handle-exception :assertion
[error request]
(let [edata (ex-data error)]
(l/with-context (get-error-context request error)
- (l/error :hint "internal error: assertion" :cause error))
+ (l/error :hint (ex-message error) :cause error))
{:status 500
:body {:type :server-error
:code :assertion
- :data (dissoc edata :data)}}))
+ :data (dissoc edata ::s/problems)}}))
(defmethod handle-exception :not-found
[err _]
diff --git a/backend/src/app/loggers/database.clj b/backend/src/app/loggers/database.clj
index 2685661d8..ca0fb5d6e 100644
--- a/backend/src/app/loggers/database.clj
+++ b/backend/src/app/loggers/database.clj
@@ -36,7 +36,7 @@
(db/insert! conn :server-error-report
{:id id :content (db/tjson event)})))
-(defn- parse-context
+(defn- parse-event-data
[event]
(reduce-kv
(fn [acc k v]
@@ -46,12 +46,11 @@
(str/blank? v) acc
:else (assoc acc k v)))
{}
- (:context event)))
+ event))
(defn parse-event
[event]
- (-> (parse-context event)
- (merge (dissoc event :context))
+ (-> (parse-event-data event)
(assoc :tenant (cf/get :tenant))
(assoc :host (cf/get :host))
(assoc :public-uri (cf/get :public-uri))
@@ -62,6 +61,7 @@
(aa/with-thread executor
(try
(let [event (parse-event event)]
+ (l/debug :hint "registering error on database" :id (:id event))
(persist-on-database! cfg event))
(catch Exception e
(l/warn :hint "unexpected exception on database error logger"
@@ -74,7 +74,8 @@
[_ {:keys [receiver] :as cfg}]
(l/info :msg "initializing database error persistence")
(let [output (a/chan (a/sliding-buffer 128)
- (filter #(= (:level %) "error")))]
+ (filter (fn [event]
+ (= (:logger/level event) "error"))))]
(receiver :sub output)
(a/go-loop []
(let [msg (a/ (count s) max-length)
+ (str (subs s 0 max-length) " [...]")
+ s)))
+
+#?(:clj
+ (defn stringify-data
+ [val]
+ (cond
+ (instance? clojure.lang.Named val)
+ (name val)
+
+ (instance? Throwable val)
+ (binding [ie/*app-frame-names* [#"app.*"]
+ ie/*fonts* nil
+ ie/*traditional* true]
+ (ie/format-exception val nil))
+
+ (string? val)
+ val
+
+ (coll? val)
+ (binding [clojure.pprint/*print-right-margin* 120]
+ (-> (with-out-str (pprint val))
+ (simple-prune (* 1024 1024 3))))
+
+ :else
+ (str val))))
+
+#?(:clj
+ (defn data->context-map
+ ^java.util.Map
+ [data]
+ (into {}
+ (comp (filter second)
+ (map (fn [[key val]]
+ [(stringify-data key)
+ (stringify-data val)])))
+ data)))
+
+#?(:clj
+ (defmacro with-context
+ [data & body]
+ `(let [data# (data->context-map ~data)]
+ (with-open [closeable# (CloseableThreadContext/putAll data#)]
+ ~@body))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Common
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
(defn get-logger
[lname]
#?(:clj (.getLogger ^LoggerContext logger-context ^String lname)
@@ -89,7 +147,7 @@
:cljs
(when glog/ENABLED
(when-let [l (get-logger logger)]
- (let [level (get-level level)
+ (let [level (get-level level)
record (glog/LogRecord. level message (.getName ^js l))]
(when exception (.setException record exception))
(glog/publishLogRecord l record))))))
@@ -100,7 +158,7 @@
(.isEnabled ^Logger logger ^Level level)))
(defmacro log
- [& {:keys [level cause ::logger ::async ::raw] :as props}]
+ [& {:keys [level cause ::logger ::async ::raw] :or {async true} :as props}]
(if (:ns &env) ; CLJS
`(write-log! ~(or logger (str *ns*))
~level
@@ -114,10 +172,12 @@
~level-sym (get-level ~level)]
(if (enabled? ~logger-sym ~level-sym)
~(if async
- `(send-off logging-agent
- (fn [_#]
- (let [message# (or ~raw (build-map-message ~props))]
- (write-log! ~logger-sym ~level-sym ~cause message#))))
+ `(let [cdata# (ThreadContext/getImmutableContext)]
+ (send-off logging-agent
+ (fn [_#]
+ (with-context (into {:cause ~cause} cdata#)
+ (->> (or ~raw (build-map-message ~props))
+ (write-log! ~logger-sym ~level-sym ~cause))))))
`(let [message# (or ~raw (build-map-message ~props))]
(write-log! ~logger-sym ~level-sym ~cause message#))))))))
@@ -149,52 +209,6 @@
(when (:ns &env)
`(set-level* ~n ~level))))
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; CLJ Specific
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defn- simple-prune
- ([s] (simple-prune s (* 1024 1024)))
- ([s max-length]
- (if (> (count s) max-length)
- (str (subs s 0 max-length) " [...]")
- s)))
-
-#?(:clj
- (defn stringify-data
- [val]
- (cond
- (instance? clojure.lang.Named val)
- (name val)
-
- (string? val)
- val
-
- (coll? val)
- (binding [clojure.pprint/*print-right-margin* 120]
- (-> (with-out-str (pprint val))
- (simple-prune (* 1024 1024 3))))
-
- :else
- (str val))))
-
-#?(:clj
- (defn data->context-map
- ^java.util.Map
- [data]
- (into {}
- (comp (filter second)
- (map (fn [[key val]]
- [(stringify-data key)
- (stringify-data val)])))
- data)))
-
-#?(:clj
- (defmacro with-context
- [data & body]
- `(with-open [instance# (CloseableThreadContext/putAll (data->context-map ~data))]
- ~@body)))
-
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; CLJS Specific
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -243,7 +257,6 @@
(some-> (get-logger name)
(glog/setLevel (get-level lvl)))))
-
#?(:cljs
(defn set-levels!
[lvls]
diff --git a/common/src/app/common/spec.cljc b/common/src/app/common/spec.cljc
index 5b46c81b2..5a2f37065 100644
--- a/common/src/app/common/spec.cljc
+++ b/common/src/app/common/spec.cljc
@@ -208,28 +208,30 @@
;; --- Macros
(defn spec-assert*
- [spec x message context]
- (if (s/valid? spec x)
- x
- (let [data (s/explain-data spec x)]
+ [spec val hint ctx]
+ (if (s/valid? spec val)
+ val
+ (let [data (s/explain-data spec val)]
(ex/raise :type :assertion
:code :spec-validation
- :hint message
- :data data
- :context context
- #?@(:cljs [:stack (.-stack (ex-info message {}))])))))
-
+ :hint hint
+ :ctx ctx
+ ::s/problems (::s/problems data)))))
(defmacro assert
"Development only assertion macro."
[spec x]
(when *assert*
(let [nsdata (:ns &env)
- context (when nsdata
+ context (if nsdata
{:ns (str (:name nsdata))
:name (pr-str spec)
:line (:line &env)
- :file (:file (:meta nsdata))})
+ :file (:file (:meta nsdata))}
+ (let [mdata (meta &form)]
+ {:ns (str (ns-name *ns*))
+ :name (pr-str spec)
+ :line (:line mdata)}))
message (str "spec assert: '" (pr-str spec) "'")]
`(spec-assert* ~spec ~x ~message ~context))))