johanels/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-12-12 06:24:17 +01:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Revert "✨ Add minor improvement to cljs impl logging"

Browse Source 
This reverts commit 960b76f760.
This commit is contained in:
Andrey Antukh
2025-10-01 10:48:24 +02:00
parent 3b81c1d750
commit 01ef55e4f4
1 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
common/src/app/common/logging.cljc
View File

@@ -49,7 +49,6 @@
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.pprint :as pp] [app.common.pprint :as pp]
[app.common.schema :as sm] [app.common.schema :as sm]
[app.common.time :as ct]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[cuerdas.core :as str] [cuerdas.core :as str]
[promesa.exec :as px] [promesa.exec :as px]
@@ -222,42 +221,36 @@
#?(:clj (inst-ms (java.time.Instant/now)) #?(:clj (inst-ms (java.time.Instant/now))
:cljs (js/Date.now))) :cljs (js/Date.now)))
(defn emit-log
[props cause context logger level sync?]
(let [props (cond-> props sync? deref)
ts (current-timestamp)
gcontext *context*
logfn (fn []
(let [props (if sync? props (deref props))
props (into (d/ordered-map) props)
context (if (and (empty? gcontext)
(empty? context))
{}
(d/without-nils (merge gcontext context)))
lrecord {::id (uuid/next)
::timestamp ts
::message (delay (build-message props))
::props props
::context context
::level level
::logger logger}
lrecord (cond-> lrecord
(some? cause)
(assoc ::cause cause
::trace (delay (build-stack-trace cause))))]
(swap! log-record (constantly lrecord))))]
(if sync?
(logfn)
(px/exec! *default-executor* logfn))))
(defmacro log! (defmacro log!
"Emit a new log record to the global log-record state (asynchronously). " "Emit a new log record to the global log-record state (asynchronously). "
[& props] [& props]
(let [{:keys [::level ::logger ::context ::sync? cause] :or {sync? false}} props (let [{:keys [::level ::logger ::context ::sync? cause] :or {sync? false}} props
props (into [] msg-props-xf props)] props (into [] msg-props-xf props)]
`(when (enabled? ~logger ~level) `(when (enabled? ~logger ~level)
(emit-log (delay ~props) ~cause ~context ~logger ~level ~sync?)))) (let [props# (cond-> (delay ~props) ~sync? deref)
ts# (current-timestamp)
context# *context*
logfn# (fn []
(let [props# (if ~sync? props# (deref props#))
props# (into (d/ordered-map) props#)
cause# ~cause
context# (d/without-nils
(merge context# ~context))
lrecord# {::id (uuid/next)
::timestamp ts#
::message (delay (build-message props#))
::props props#
::context context#
::level ~level
::logger ~logger}
lrecord# (cond-> lrecord#
(some? cause#)
(assoc ::cause cause#
::trace (delay (build-stack-trace cause#))))]
(swap! log-record (constantly lrecord#))))]
(if ~sync?
(logfn#)
(px/exec! *default-executor* logfn#))))))
#?(:clj #?(:clj
(defn slf4j-log-handler (defn slf4j-log-handler
@@ -283,8 +276,7 @@
(when (enabled? logger level) (when (enabled? logger level)
(let [hstyles (str/ffmt "font-weight: 600; color: %" (level->color level)) (let [hstyles (str/ffmt "font-weight: 600; color: %" (level->color level))
mstyles (str/ffmt "font-weight: 300; color: %" (level->color level)) mstyles (str/ffmt "font-weight: 300; color: %" (level->color level))
ts (ct/format-inst (ct/now) "kk:mm:ss.SSSS") header (str/concat "%c" (level->name level) " [" logger "] ")
header (str/concat "%c" (level->name level) " " ts " [" logger "] ")
message (str/concat header "%c" @message)] message (str/concat header "%c" @message)]
(js/console.group message hstyles mstyles) (js/console.group message hstyles mstyles)