3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-20 14:26:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Backport changes from develop.

Browse source
This commit is contained in:
alonso.torres 2021-12-30 11:19:46 +01:00 • committed by Andrey Antukh
parent dea090e7d3
commit 71734df489
17 changed files with 420 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CHANGES.md
View file

@ -9,6 +9,19 @@
### :heart: Community contributions by (Thank you!) ### :heart: Community contributions by (Thank you!)
# 1.10.4-beta
### :sparkles: Enhacements
- Allow parametrice file snapshoting interval.
### :bug: Bugs fixed
- Fix issue on :mov-object change impl.
- Minor fix on how file changes log is persisted.
- Fix many issues on error reporting.
# 1.10.3-beta # 1.10.3-beta
### :sparkles: Enhacements ### :sparkles: Enhacements

94
backend/resources/error-list.tmpl Normal file
View file

@ -0,0 +1,94 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<meta name="robots" content="noindex,nofollow">
<meta http-equiv="x-ua-compatible" content="ie=edge" />
<title>penpot - error report {{id}}</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=JetBrains+Mono">
<style>
* {
font-family: "JetBrains Mono", monospace;
font-size: 12px;
}
body {
margin: 0px;
padding: 0px;
}
h1 {
padding: 0px;
margin: 0px;
font-size: 14px;
}
main {
margin: 20px;
margin-top: 40px;
}
nav {
position: fixed;
width: 100vw;
top: 0;
left: 0;
padding: 5px 20px;
display: flex;
background: #e3e3e3;
}
nav > div {
text-transform: uppercase;
font-weight: bold;
}
ul {
display: flex;
margin: 0px;
padding: 0px;
flex-direction: column;
flex-wrap: wrap;
height: calc(100vh - 75px);
justify-content: flex-start;
}
li {
list-style: none;
padding: 0px;
margin: 0px;
line-height: 18px;
min-width: 210px;
margin: 0px 20px;
cursor: pointer;
display: flex;
justify-content: center;
border-radius: 3px;
}
li:hover {
background-color: #e9e9e9;
}
li > a {
text-decoration: none;
color: inherit;
}
</style>
</head>
<body>
<nav>
<h1>Latest error reports:</h1>
</nav>
<main>
<ul>
{% for item in items %}
<li><a href="/dbg/error/{{item.id}}">{{item.created-at}}</a></li>
{% endfor %}
</ul>
</main>
</body>
</html>

173
backend/resources/error-report.tmpl
View file

@ -13,15 +13,40 @@
} }
pre { pre {
margin: 0px; margin: 0px;
line-height: 17px;
} }
main {
margin: 20px;
}
nav {
position: fixed;
width: 100vw;
top: 0;
left: 0;
padding: 5px 20px;
display: flex;
background: #e3e3e3;
}
nav > div {
text-transform: uppercase;
font-weight: bold;
}
nav > div:not(:last-child) {
margin-right: 10px;
}
* { * {
font-family: "JetBrains Mono", monospace; font-family: "JetBrains Mono", monospace;
font-size: 12px; font-size: 12px;
} }
.table { .table {
margin-top: 25px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 10px;
} }
.table-row { .table-row {
@ -34,6 +59,9 @@
font-weight: 600; font-weight: 600;
width: 60px; width: 60px;
padding: 4px; padding: 4px;
padding-top: 40px;
margin-top: -40px;
} }
.table-val { .table-val {
@ -57,109 +85,45 @@
</style> </style>
</head> </head>
<body> <body>
<nav>
<div>[<a href="/dbg/error"><<</a>]</div>
<div>[<a href="#context">context</a>]</div>
<div>[<a href="#params">params</a>]</div>
{% if spec-problems %}
<div>[<a href="#edata">spec</a>]</div>
{% endif %}
{% if data %}
<div>[<a href="#edata">data</a>]</div>
{% endif %}
{% if trace %}
<div>[<a href="#trace">trace</a>]</div>
{% endif %}
</nav>
<main>
<div class="table"> <div class="table">
<div class="table-row"> <div class="table-row multiline">
<div class="table-key" title="Error ID">ERID: </div> <div id="context" class="table-key">CONTEXT: </div>
<div class="table-val">{{id}}</div> <div class="table-val">
<pre>{{context}}</pre>
</div> </div>
{% if profile-id %}
<div class="table-row">
<div class="table-key" title="Profile ID">PFID: </div>
<div class="table-val">{{profile-id}}</div>
</div> </div>
{% endif %}
{% if user-agent %}
<div class="table-row">
<div class="table-key">UAGT: </div>
<div class="table-val">{{user-agent}}</div>
</div>
{% endif %}
{% if frontend-version %}
<div class="table-row">
<div class="table-key">FVER: </div>
<div class="table-val">{{frontend-version}}</div>
</div>
{% endif %}
<div class="table-row">
<div class="table-key">BVER: </div>
<div class="table-val">{{version}}</div>
</div>
{% if host %}
<div class="table-row">
<div class="table-key">HOST: </div>
<div class="table-val">{{host}}</div>
</div>
{% endif %}
{% if tenant %}
<div class="table-row">
<div class="table-key">ENV: </div>
<div class="table-val">{{tenant}}</div>
</div>
{% endif %}
{% if public-uri %}
<div class="table-row">
<div class="table-key">PURI: </div>
<div class="table-val">{{public-uri}}</div>
</div>
{% endif %}
{% if type %}
<div class="table-row">
<div class="table-key">TYPE: </div>
<div class="table-val">{{type}}</div>
</div>
{% endif %}
{% if code %}
<div class="table-row">
<div class="table-key">CODE: </div>
<div class="table-val">{{code}}</div>
</div>
{% endif %}
{% if error %}
<div class="table-row">
<div class="table-key">CLSS: </div>
<div class="table-val">{{error.class}}</div>
</div>
{% endif %}
{% if hint %}
<div class="table-row">
<div class="table-key">HINT: </div>
<div class="table-val">{{hint}}</div>
</div>
{% endif %}
{% if method %}
<div class="table-row">
<div class="table-key">PATH: </div>
<div class="table-val">{{method|upper}} {{path}}</div>
</div>
{% endif %}
<div>(<a href="#explain">go to explain</a>)</div>
<div>(<a href="#edata">go to edata</a>)</div>
<div>(<a href="#trace">go to trace</a>)</div>
{% if params %} {% if params %}
<div id="params" class="table-row multiline"> <div class="table-row multiline">
<div class="table-key">PARAMS: </div> <div id="params" class="table-key">PARAMS: </div>
<div class="table-val"> <div class="table-val">
<pre>{{params}}</pre> <pre>{{params}}</pre>
</div> </div>
</div> </div>
{% endif %} {% endif %}
<!-- NOTE: this is legacy, for old error data saved on the database -->
{% if data %} {% if data %}
<div id="edata" class="table-row multiline"> <div class="table-row multiline">
<div class="table-key">ERROR DATA: </div> <div id="edata" class="table-key">ERROR DATA: </div>
<div class="table-val"> <div class="table-val">
<pre>{{data}}</pre> <pre>{{data}}</pre>
</div> </div>
@ -167,37 +131,24 @@
{% endif %} {% endif %}
{% if spec-problems %} {% if spec-problems %}
<div id="edata" class="table-row multiline"> <div class="table-row multiline">
<div class="table-key">SPEC PROBLEMS: </div> <div id="spec-problems" class="table-key">SPEC PROBLEMS: </div>
<div class="table-val"> <div class="table-val">
<pre>{{spec-problems}}</pre> <pre>{{spec-problems}}</pre>
</div> </div>
</div> </div>
{% endif %} {% endif %}
{% if cause %} {% if trace %}
<div id="trace" class="table-row multiline"> <div class="table-row multiline">
<div class="table-key">TRACE:</div> <div id="trace" class="table-key">TRACE:</div>
<div class="table-val">
<pre>{{cause}}</pre>
</div>
</div>
{% elif trace %}
<div id="trace" class="table-row multiline">
<div class="table-key">TRACE:</div>
<div class="table-val"> <div class="table-val">
<pre>{{trace}}</pre> <pre>{{trace}}</pre>
</div> </div>
</div> </div>
{% elif error %}
<div id="trace" class="table-row multiline">
<div class="table-key">TRACE:</div>
<div class="table-val">
<pre>{{error.trace}}</pre>
</div>
</div>
{% endif %} {% endif %}
</div> </div>
</main>
</body> </body>
</html> </html>

10
backend/src/app/config.clj
View file

@ -51,6 +51,9 @@
:default-blob-version 3 :default-blob-version 3
:loggers-zmq-uri "tcp://localhost:45556" :loggers-zmq-uri "tcp://localhost:45556"
:file-change-snapshot-every 5
:file-change-snapshot-timeout "3h"
:public-uri "http://localhost:3449" :public-uri "http://localhost:3449"
:redis-uri "redis://redis/0" :redis-uri "redis://redis/0"
@ -98,6 +101,10 @@
(s/def ::audit-log-archive-uri ::us/string) (s/def ::audit-log-archive-uri ::us/string)
(s/def ::audit-log-gc-max-age ::dt/duration) (s/def ::audit-log-gc-max-age ::dt/duration)
(s/def ::admins ::us/set-of-str)
(s/def ::file-change-snapshot-every ::us/integer)
(s/def ::file-change-snapshot-timeout ::dt/duration)
(s/def ::secret-key ::us/string) (s/def ::secret-key ::us/string)
(s/def ::allow-demo-users ::us/boolean) (s/def ::allow-demo-users ::us/boolean)
(s/def ::assets-path ::us/string) (s/def ::assets-path ::us/string)
@ -185,6 +192,7 @@
(s/def ::config (s/def ::config
(s/keys :opt-un [::secret-key (s/keys :opt-un [::secret-key
::flags ::flags
::admins
::allow-demo-users ::allow-demo-users
::audit-log-archive-uri ::audit-log-archive-uri
::audit-log-gc-max-age ::audit-log-gc-max-age
@ -193,6 +201,8 @@
::database-username ::database-username
::default-blob-version ::default-blob-version
::error-report-webhook ::error-report-webhook
::file-change-snapshot-every
::file-change-snapshot-timeout
::user-feedback-destination ::user-feedback-destination
::github-client-id ::github-client-id
::github-client-secret ::github-client-secret

21
backend/src/app/http.clj
View file

@ -12,6 +12,7 @@
[app.common.spec :as us] [app.common.spec :as us]
[app.http.doc :as doc] [app.http.doc :as doc]
[app.http.errors :as errors] [app.http.errors :as errors]
[app.http.debug :as debug]
[app.http.middleware :as middleware] [app.http.middleware :as middleware]
[app.metrics :as mtx] [app.metrics :as mtx]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
@ -104,17 +105,16 @@
(s/def ::storage map?) (s/def ::storage map?)
(s/def ::assets map?) (s/def ::assets map?)
(s/def ::feedback fn?) (s/def ::feedback fn?)
(s/def ::error-report-handler fn?)
(s/def ::audit-http-handler fn?) (s/def ::audit-http-handler fn?)
(s/def ::debug map?)
(defmethod ig/pre-init-spec ::router [_] (defmethod ig/pre-init-spec ::router [_]
(s/keys :req-un [::rpc ::session ::mtx/metrics (s/keys :req-un [::rpc ::session ::mtx/metrics
::oauth ::storage ::assets ::feedback ::oauth ::storage ::assets ::feedback
::error-report-handler ::debug ::audit-http-handler]))
::audit-http-handler]))
(defmethod ig/init-key ::router (defmethod ig/init-key ::router
[_ {:keys [session rpc oauth metrics assets feedback] :as cfg}] [_ {:keys [session rpc oauth metrics assets feedback debug] :as cfg}]
(rr/router (rr/router
[["/metrics" {:get (:handler metrics)}] [["/metrics" {:get (:handler metrics)}]
["/assets" {:middleware [[middleware/format-response-body] ["/assets" {:middleware [[middleware/format-response-body]
@ -125,8 +125,17 @@
["/by-file-media-id/:id" {:get (:file-objects-handler assets)}] ["/by-file-media-id/:id" {:get (:file-objects-handler assets)}]
["/by-file-media-id/:id/thumbnail" {:get (:file-thumbnails-handler assets)}]] ["/by-file-media-id/:id/thumbnail" {:get (:file-thumbnails-handler assets)}]]
["/dbg" ["/dbg" {:middleware [[middleware/params]
["/error-by-id/:id" {:get (:error-report-handler cfg)}]] [middleware/keyword-params]
[middleware/format-response-body]
[middleware/errors errors/handle]
[middleware/cookies]
[(:middleware session)]]}
["/error-by-id/:id" {:get (:retrieve-error debug)}]
["/error/:id" {:get (:retrieve-error debug)}]
["/error" {:get (:retrieve-error-list debug)}]
["/file/data/:id" {:get (:retrieve-file-data debug)}]
["/file/changes/:id" {:get (:retrieve-file-changes debug)}]]
["/webhooks" ["/webhooks"
["/sns" {:post (:sns-webhook cfg)}]] ["/sns" {:post (:sns-webhook cfg)}]]

165
backend/src/app/http/debug.clj Normal file
View file

@ -0,0 +1,165 @@
;; This Source Code Form is subject to the terms of the Mozilla Public
;; License, v. 2.0. If a copy of the MPL was not distributed with this
;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
;;
;; Copyright (c) UXBOX Labs SL
(ns app.http.debug
(:require
[app.common.data :as d]
[app.common.exceptions :as ex]
[app.common.spec :as us]
[app.common.transit :as t]
[app.common.uuid :as uuid]
[app.config :as cf]
[app.db :as db]
[app.rpc.queries.profile :as profile]
[app.util.blob :as blob]
[app.util.json :as json]
[app.util.template :as tmpl]
[app.util.time :as dt]
[clojure.java.io :as io]
[clojure.pprint :as ppr]
[clojure.spec.alpha :as s]
[cuerdas.core :as str]
[integrant.core :as ig]))
(def sql:retrieve-range-of-changes
"select revn, changes from file_change where file_id=? and revn >= ? and revn <= ? order by revn")
(def sql:retrieve-single-change
"select revn, changes, data from file_change where file_id=? and revn = ?")
(defn authorized?
[pool {:keys [profile-id]}]
(or (= "devenv" (cf/get :host))
(let [profile (ex/ignoring (profile/retrieve-profile-data pool profile-id))
admins (or (cf/get :admins) #{})]
(contains? admins (:email profile)))))
(defn prepare-response
[body]
(when-not body
(ex/raise :type :not-found
:code :enpty-data
:hint "empty response"))
{:status 200
:headers {"content-type" "application/transit+json"}
:body body})
(defn retrieve-file-data
[{:keys [pool]} request]
(when-not (authorized? pool request)
(ex/raise :type :authentication
:code :only-admins-allowed))
(let [id (some-> (get-in request [:path-params :id]) uuid/uuid)
revn (some-> (get-in request [:params :revn]) d/parse-integer)]
(when-not id
(ex/raise :type :validation
:code :missing-arguments))
(if (integer? revn)
(let [fchange (db/exec-one! pool [sql:retrieve-single-change id revn])]
(prepare-response (some-> fchange :data blob/decode)))
(let [file (db/get-by-id pool :file id)]
(prepare-response (some-> file :data blob/decode))))))
(defn retrieve-file-changes
[{:keys [pool]} {:keys [params path-params profile-id] :as request}]
(when-not (authorized? pool request)
(ex/raise :type :authentication
:code :only-admins-allowed))
(let [id (some-> (get-in request [:path-params :id]) uuid/uuid)
revn (get-in request [:params :revn] "latest")]
(when (or (not id) (not revn))
(ex/raise :type :validation
:code :invalid-arguments
:hint "missing arguments"))
(cond
(d/num-string? revn)
(let [item (db/exec-one! pool [sql:retrieve-single-change id (d/parse-integer revn)])]
(prepare-response (some-> item :changes blob/decode vec)))
(str/includes? revn ":")
(let [[start end] (->> (str/split revn #":")
(map str/trim)
(map d/parse-integer))
items (db/exec! pool [sql:retrieve-range-of-changes id start end])]
(prepare-response (some->> items
(map :changes)
(map blob/decode)
(mapcat identity)
(vec))))
:else
(ex/raise :type :validation :code :invalid-arguments))))
(defn retrieve-error
[{:keys [pool]} request]
(letfn [(parse-id [request]
(let [id (get-in request [:path-params :id])
id (us/uuid-conformer id)]
(when (uuid? id)
id)))
(retrieve-report [id]
(ex/ignoring
(some-> (db/get-by-id pool :server-error-report id) :content db/decode-transit-pgobject)))
(render-template [report]
(binding [ppr/*print-right-margin* 300]
(let [context (dissoc report :trace :cause :params :data :spec-prob :spec-problems)
params {:context (with-out-str (ppr/pprint context))
:data (:data report)
:trace (or (:cause report)
(:trace report)
(some-> report :error :trace))
:params (:params report)}]
(-> (io/resource "error-report.tmpl")
(tmpl/render params)))))
]
(when-not (authorized? pool request)
(ex/raise :type :authentication
:code :only-admins-allowed))
(let [result (some-> (parse-id request)
(retrieve-report)
(render-template))]
(if result
{:status 200
:headers {"content-type" "text/html; charset=utf-8"
"x-robots-tag" "noindex"}
:body result}
{:status 404
:body "not found"}))))
(def sql:error-reports
"select id, created_at from server_error_report order by created_at desc limit 100")
(defn retrieve-error-list
[{:keys [pool]} request]
(when-not (authorized? pool request)
(ex/raise :type :authentication
:code :only-admins-allowed))
(let [items (db/exec! pool [sql:error-reports])
items (map #(update % :created-at dt/format-instant :rfc1123) items)]
{:status 200
:headers {"content-type" "text/html; charset=utf-8"
"x-robots-tag" "noindex"}
:body (-> (io/resource "error-list.tmpl")
(tmpl/render {:items items}))}))
(defmethod ig/init-key ::handlers
[_ {:keys [pool] :as cfg}]
{:retrieve-file-data (partial retrieve-file-data cfg)
:retrieve-file-changes (partial retrieve-file-changes cfg)
:retrieve-error (partial retrieve-error cfg)
:retrieve-error-list (partial retrieve-error-list cfg)})

20
backend/src/app/http/errors.clj
View file

@ -30,14 +30,13 @@
:hint (or (:hint data) (ex-message error)) :hint (or (:hint data) (ex-message error))
:params (l/stringify-data (:params request)) :params (l/stringify-data (:params request))
:spec-problems (some-> data ::s/problems) :spec-problems (some-> data ::s/problems)
:data (some-> data (dissoc ::s/problems))
:ip-addr (parse-client-ip request) :ip-addr (parse-client-ip request)
:profile-id (:profile-id request)} :profile-id (:profile-id request)}
(let [headers (:headers request)] (let [headers (:headers request)]
{:user-agent (get headers "user-agent") {:user-agent (get headers "user-agent")
:frontend-version (get headers "x-frontend-version" "unknown")}) :frontend-version (get headers "x-frontend-version" "unknown")}))))
(dissoc data ::s/problems))))
(defmulti handle-exception (defmulti handle-exception
(fn [err & _rest] (fn [err & _rest]
@ -54,18 +53,9 @@
{:status 400 :body (ex-data err)}) {:status 400 :body (ex-data err)})
(defmethod handle-exception :validation (defmethod handle-exception :validation
[err req] [err _]
(let [header (get-in req [:headers "accept"]) (let [edata (ex-data err)]
edata (ex-data err)] {:status 400 :body (dissoc edata ::s/problems)}))
(if (and (= :spec-validation (:code edata))
(str/starts-with? header "text/html"))
{:status 400
:headers {"content-type" "text/html"}
:body (str "<pre style='font-size:16px'>"
(:explain edata)
"</pre>\n")}
{:status 400
:body (dissoc edata ::s/problems)})))
(defmethod handle-exception :assertion (defmethod handle-exception :assertion
[error request] [error request]

1
backend/src/app/http/session.clj
View file

@ -73,6 +73,7 @@
(if-let [{:keys [id profile-id] :as session} (retrieve-from-request cfg request)] (if-let [{:keys [id profile-id] :as session} (retrieve-from-request cfg request)]
(do (do
(a/>!! (::events-ch cfg) id) (a/>!! (::events-ch cfg) id)
(l/set-context! {:profile-id profile-id})
(handler (assoc request :profile-id profile-id))) (handler (assoc request :profile-id profile-id)))
(handler request)))) (handler request))))

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

@ -14,10 +14,8 @@
[app.config :as cf] [app.config :as cf]
[app.db :as db] [app.db :as db]
[app.util.async :as aa] [app.util.async :as aa]
[app.util.template :as tmpl]
[app.worker :as wrk] [app.worker :as wrk]
[clojure.core.async :as a] [clojure.core.async :as a]
[clojure.java.io :as io]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]
[cuerdas.core :as str] [cuerdas.core :as str]
[integrant.core :as ig])) [integrant.core :as ig]))
@ -60,8 +58,10 @@
[{:keys [executor] :as cfg} event] [{:keys [executor] :as cfg} event]
(aa/with-thread executor (aa/with-thread executor
(try (try
(let [event (parse-event event)] (let [event (parse-event event)
(l/debug :hint "registering error on database" :id (:id event)) uri (cf/get :public-uri)]
(l/debug :hint "registering error on database" :id (:id event)
:uri (str uri "/dbg/error/" (:id event)))
(persist-on-database! cfg event)) (persist-on-database! cfg event))
(catch Exception e (catch Exception e
(l/warn :hint "unexpected exception on database error logger" (l/warn :hint "unexpected exception on database error logger"
@ -89,39 +89,3 @@
(defmethod ig/halt-key! ::reporter (defmethod ig/halt-key! ::reporter
[_ output] [_ output]
(a/close! output)) (a/close! output))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Http Handler
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defmethod ig/pre-init-spec ::handler [_]
(s/keys :req-un [::db/pool]))
(defmethod ig/init-key ::handler
[_ {:keys [pool] :as cfg}]
(letfn [(parse-id [request]
(let [id (get-in request [:path-params :id])
id (us/uuid-conformer id)]
(when (uuid? id)
id)))
(retrieve-report [id]
(ex/ignoring
(when-let [{:keys [content] :as row} (db/get-by-id pool :server-error-report id)]
(assoc row :content (db/decode-transit-pgobject content)))))
(render-template [{:keys [content] :as report}]
(some-> (io/resource "error-report.tmpl")
(tmpl/render content)))]
(fn [request]
(let [result (some-> (parse-id request)
(retrieve-report)
(render-template))]
(if result
{:status 200
:headers {"content-type" "text/html; charset=utf-8"
"x-robots-tag" "noindex"}
:body result}
{:status 404
:body "not found"})))))

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

@ -25,7 +25,7 @@
[cfg {:keys [host id public-uri] :as event}] [cfg {:keys [host id public-uri] :as event}]
(try (try
(let [uri (:uri cfg) (let [uri (:uri cfg)
text (str "Exception on (host: " host ", url: " public-uri "/dbg/error-by-id/" id ")\n" text (str "Exception on (host: " host ", url: " public-uri "/dbg/error/" id ")\n"
(when-let [pid (:profile-id event)] (when-let [pid (:profile-id event)]
(str "- profile-id: #uuid-" pid "\n"))) (str "- profile-id: #uuid-" pid "\n")))
rsp (http/send! {:uri uri rsp (http/send! {:uri uri

10
backend/src/app/main.clj
View file

@ -106,8 +106,11 @@
:storage (ig/ref :app.storage/storage) :storage (ig/ref :app.storage/storage)
:sns-webhook (ig/ref :app.http.awsns/handler) :sns-webhook (ig/ref :app.http.awsns/handler)
:feedback (ig/ref :app.http.feedback/handler) :feedback (ig/ref :app.http.feedback/handler)
:audit-http-handler (ig/ref :app.loggers.audit/http-handler) :debug (ig/ref :app.http.debug/handlers)
:error-report-handler (ig/ref :app.loggers.database/handler)} :audit-http-handler (ig/ref :app.loggers.audit/http-handler)}
:app.http.debug/handlers
{:pool (ig/ref :app.db/pool)}
:app.http.assets/handlers :app.http.assets/handlers
{:metrics (ig/ref :app.metrics/metrics) {:metrics (ig/ref :app.metrics/metrics)
@ -306,9 +309,6 @@
:pool (ig/ref :app.db/pool) :pool (ig/ref :app.db/pool)
:executor (ig/ref :app.worker/executor)} :executor (ig/ref :app.worker/executor)}
:app.loggers.database/handler
{:pool (ig/ref :app.db/pool)}
:app.loggers.sentry/reporter :app.loggers.sentry/reporter
{:dsn (cf/get :sentry-dsn) {:dsn (cf/get :sentry-dsn)
:trace-sample-rate (cf/get :sentry-trace-sample-rate 1.0) :trace-sample-rate (cf/get :sentry-trace-sample-rate 1.0)

13
backend/src/app/rpc/mutations/files.clj
View file

@ -11,6 +11,7 @@
[app.common.pages.migrations :as pmg] [app.common.pages.migrations :as pmg]
[app.common.spec :as us] [app.common.spec :as us]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.config :as cf]
[app.db :as db] [app.db :as db]
[app.metrics :as mtx] [app.metrics :as mtx]
[app.rpc.permissions :as perms] [app.rpc.permissions :as perms]
@ -280,11 +281,13 @@
(defn- take-snapshot? (defn- take-snapshot?
"Defines the rule when file `data` snapshot should be saved." "Defines the rule when file `data` snapshot should be saved."
[{:keys [revn modified-at] :as file}] [{:keys [revn modified-at] :as file}]
;; The snapshot will be saved every 20 changes or if the last (let [freq (or (cf/get :file-change-snapshot-every) 20)
;; modification is older than 3 hour. timeout (or (cf/get :file-change-snapshot-timeout)
(or (zero? (mod revn 20)) (dt/duration {:hours 1}))]
(or (= 1 freq)
(zero? (mod revn freq))
(> (inst-ms (dt/diff modified-at (dt/now))) (> (inst-ms (dt/diff modified-at (dt/now)))
(inst-ms (dt/duration {:hours 3}))))) (inst-ms timeout)))))
(defn- delete-from-storage (defn- delete-from-storage
[{:keys [storage] :as cfg} file] [{:keys [storage] :as cfg} file]
@ -309,6 +312,8 @@
(mapcat :changes changes-with-metadata) (mapcat :changes changes-with-metadata)
changes) changes)
changes (vec changes)
;; Trace the number of changes processed ;; Trace the number of changes processed
_ ((::mtx/fn mtx1) {:by (count changes)}) _ ((::mtx/fn mtx1) {:by (count changes)})

5
common/src/app/common/data.cljc
View file

@ -252,6 +252,11 @@
#?(:clj (Object.) #?(:clj (Object.)
:cljs (js/Object.))) :cljs (js/Object.)))
(defn getf
"Returns a function to access a map"
[coll]
(partial get coll))
(defn update-in-when (defn update-in-when
[m key-seq f & args] [m key-seq f & args]
(let [found (get-in m key-seq sentinel)] (let [found (get-in m key-seq sentinel)]

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

@ -65,7 +65,7 @@
val val
(coll? val) (coll? val)
(binding [clojure.pprint/*print-right-margin* 120] (binding [clojure.pprint/*print-right-margin* 200]
(-> (with-out-str (pprint val)) (-> (with-out-str (pprint val))
(simple-prune (* 1024 1024 3)))) (simple-prune (* 1024 1024 3))))
@ -83,6 +83,12 @@
(stringify-data val)]))) (stringify-data val)])))
data))) data)))
#?(:clj
(defn set-context!
[data]
(ThreadContext/putAll (data->context-map data))
nil))
#?(:clj #?(:clj
(defmacro with-context (defmacro with-context
[data & body] [data & body]

3
common/src/app/common/pages/changes.cljc
View file

@ -195,7 +195,8 @@
[data {:keys [parent-id shapes index page-id component-id ignore-touched]}] [data {:keys [parent-id shapes index page-id component-id ignore-touched]}]
(letfn [(is-valid-move? [objects shape-id] (letfn [(is-valid-move? [objects shape-id]
(let [invalid-targets (cph/calculate-invalid-targets shape-id objects)] (let [invalid-targets (cph/calculate-invalid-targets shape-id objects)]
(and (not (invalid-targets parent-id)) (and (contains? objects shape-id)
(not (invalid-targets parent-id))
(cph/valid-frame-target shape-id parent-id objects)))) (cph/valid-frame-target shape-id parent-id objects))))
(insert-items [prev-shapes index shapes] (insert-items [prev-shapes index shapes]

2
common/src/app/common/spec.cljc
View file

@ -256,7 +256,7 @@
(let [data (s/explain-data spec data)] (let [data (s/explain-data spec data)]
(throw (ex/error :type :validation (throw (ex/error :type :validation
:code :spec-validation :code :spec-validation
:data data)))) ::s/problems (::s/problems data)))))
result)) result))
(defmacro instrument! (defmacro instrument!

1
frontend/src/app/main/data/workspace/changes.cljs
View file

@ -120,7 +120,6 @@
(log/debug :msg "commit-changes" (log/debug :msg "commit-changes"
:js/redo-changes redo-changes :js/redo-changes redo-changes
:js/undo-changes undo-changes) :js/undo-changes undo-changes)
(let [error (volatile! nil)] (let [error (volatile! nil)]
(ptk/reify ::commit-changes (ptk/reify ::commit-changes
cljs.core/IDeref cljs.core/IDeref