3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-15 19:16:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Fix issues from previous refactor peer review

Browse source
This commit is contained in:
Andrey Antukh 2022-03-09 17:29:33 +01:00
parent 9841a39d04
commit f7bb08382c
6 changed files with 23 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,18 +21,17 @@
(yrq/get-header request "x-real-ip")
(yrq/remote-addr request)))
(defn get-error-context
[request error]
(let [data (ex-data error)]
(merge
{:path (:uri request)
:method (:request-method request)
:params (:params request)
: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")}))))
(defn get-context
[request]
(merge
{:path (:uri request)
:method (:request-method request)
:params (:params request)
: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")})))
(defmulti handle-exception
(fn [err & _rest]
@ -61,7 +60,7 @@
(let [edata (ex-data error)
explain (us/pretty-explain edata)]
(l/error ::l/raw (ex-message error)
::l/context (get-error-context request error)
::l/context (get-context request)
:cause error)
(yrs/response :status 500
:body {:type :server-error
@ -87,7 +86,7 @@
(handle-exception (:handling edata) request)
(do
(l/error ::l/raw (ex-message error)
::l/context (get-error-context request error)
::l/context (get-context request)
:cause error)
(yrs/response 500 {:type :server-error
:code :unexpected
@ -98,7 +97,7 @@
[error request]
(let [state (.getSQLState ^java.sql.SQLException error)]
(l/error ::l/raw (ex-message error)
::l/context (get-error-context request error)
::l/context (get-context request)
:cause error)
(cond
(= state "57014")