diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index e04b0523d..0668a4a0b 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -156,9 +156,9 @@ [mw/params] [mw/format-response] [mw/parse-request] - [mw/errors errors/handle] [session/soft-auth cfg] [actoken/soft-auth cfg] + [mw/errors errors/handle] [mw/restrict-methods]]} (::mtx/routes cfg) diff --git a/backend/src/app/http/errors.clj b/backend/src/app/http/errors.clj index 35e58bbca..9647ecec2 100644 --- a/backend/src/app/http/errors.clj +++ b/backend/src/app/http/errors.clj @@ -62,7 +62,8 @@ ::yres/body data} (binding [l/*context* (request->context request)] - (l/err :hint "restriction error" :data data) + (l/err :hint "restriction error" + :cause err) {::yres/status 400 ::yres/body data})))) @@ -102,7 +103,7 @@ (= code :invalid-image) (binding [l/*context* (request->context request)] (let [cause (or parent-cause err)] - (l/warn :hint "unexpected error on processing image" :cause cause) + (l/warn :hint "image process error" :cause cause) {::yres/status 400 ::yres/body data})) :else @@ -177,7 +178,7 @@ (let [state (.getSQLState ^java.sql.SQLException error) cause (or parent-cause error)] (binding [l/*context* (request->context request)] - (l/error :hint "PSQL error" + (l/error :hint "postgresql error" :cause cause) (cond (= state "57014") diff --git a/backend/src/app/loggers/database.clj b/backend/src/app/loggers/database.clj index 41584eddc..196845a96 100644 --- a/backend/src/app/loggers/database.clj +++ b/backend/src/app/loggers/database.clj @@ -53,11 +53,16 @@ (assoc :logger/name logger) (assoc :logger/level level) (dissoc :request/params :value :params :data))] + (merge {:context (-> (into (sorted-map) ctx) (pp/pprint-str :length 50)) :props (pp/pprint-str props :length 50) - :hint (or (ex-message cause) @message) + :hint (or (when-let [message (ex-message cause)] + (if-let [props-hint (:hint props)] + (str props-hint ": " message) + message)) + @message) :trace (or (::trace record) (some-> cause (ex/format-throwable :data? false :explain? false :header? false :summary? false)))} diff --git a/backend/src/app/rpc/commands/binfile.clj b/backend/src/app/rpc/commands/binfile.clj index 49ab84193..04f550676 100644 --- a/backend/src/app/rpc/commands/binfile.clj +++ b/backend/src/app/rpc/commands/binfile.clj @@ -38,7 +38,6 @@ (def ^:private schema:export-binfile [:map {:title "export-binfile"} - [:name [:string {:max 250}]] [:file-id ::sm/uuid] [:version {:optional true} ::sm/int] [:include-libraries ::sm/boolean] @@ -78,7 +77,7 @@ "Export a penpot file in a binary format." {::doc/added "1.15" ::webhooks/event? true - ::sm/result schema:export-binfile} + ::sm/params schema:export-binfile} [{:keys [::db/pool] :as cfg} {:keys [::rpc/profile-id version file-id] :as params}] (files/check-read-permissions! pool profile-id file-id) (fn [_]