3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-08-01 14:38:40 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into staging

Browse source
This commit is contained in:
Andrey Antukh 2022-03-07 13:08:20 +01:00
commit d731a095c6
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/src/app/loggers/database.clj
View file

@ -50,7 +50,7 @@
(assoc :host (cf/get :host)) (assoc :host (cf/get :host))
(assoc :public-uri (cf/get :public-uri)) (assoc :public-uri (cf/get :public-uri))
(assoc :version (:full cf/version)) (assoc :version (:full cf/version))
(assoc :id (uuid/next)))) (update :id #(or % (uuid/next)))))
(defn handle-event (defn handle-event
[{:keys [executor] :as cfg} event] [{:keys [executor] :as cfg} event]

8
common/src/app/common/logging.cljc
View file

@ -36,12 +36,12 @@
(reduce-kv #(.with ^MapMessage %1 (name %2) %3) message m)))) (reduce-kv #(.with ^MapMessage %1 (name %2) %3) message m))))
#?(:clj #?(:clj
(def logger-context (def logger-context
(LogManager/getContext false))) (LogManager/getContext false)))
#?(:clj #?(:clj
(def logging-agent (def logging-agent
(agent nil :error-mode :continue))) (agent nil :error-mode :continue)))
(defn- simple-prune (defn- simple-prune
([s] (simple-prune s (* 1024 1024))) ([s] (simple-prune s (* 1024 1024)))