From 412a3c923b374803548ea9834aec7b736330912f Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 19 Jan 2021 16:33:32 +0100 Subject: [PATCH] :bug: Fix unexpected exception on pprint error. --- backend/src/app/config.clj | 6 ++---- backend/src/app/main.clj | 12 ++++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/backend/src/app/config.clj b/backend/src/app/config.clj index 92ef6c89d..8126de29a 100644 --- a/backend/src/app/config.clj +++ b/backend/src/app/config.clj @@ -29,10 +29,12 @@ :public-uri "http://localhost:3449/" :redis-uri "redis://localhost/0" + :storage-backend :fs :storage-fs-old-directory "resources/public/media" :storage-fs-directory "resources/public/assets" :storage-fs-uri "http://localhost:3449/internal/assets/" :storage-s3-region :eu-central-1 + :storage-s3-bucket "penpot-devenv-assets-pre" :image-process-max-threads 2 @@ -223,7 +225,3 @@ (def default-deletion-delay (dt/duration {:hours 48})) - -(prefer-method print-method - clojure.lang.IRecord - clojure.lang.IDeref) diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index a13994648..8e41d0adb 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -12,11 +12,12 @@ [app.config :as cfg] [app.common.data :as d] [app.util.time :as dt] + [clojure.pprint :as pprint] [clojure.tools.logging :as log] [integrant.core :as ig])) ;; Set value for all new threads bindings. -(alter-var-root #'*assert* (constantly (:assets-enabled cfg/config))) +(alter-var-root #'*assert* (constantly (:asserts-enabled cfg/config))) (derive :app.telemetry/server :app.http/server) @@ -85,7 +86,6 @@ :svgparse (ig/ref :app.svgparse/handler) :storage (ig/ref :app.storage/storage)} - :app.svgparse/svgc {:metrics (ig/ref :app.metrics/metrics)} @@ -299,6 +299,14 @@ (when sys (ig/halt! sys)) nil))) +(prefer-method print-method + clojure.lang.IRecord + clojure.lang.IDeref) + +(prefer-method pprint/simple-dispatch + clojure.lang.IPersistentMap + clojure.lang.IDeref) + (defn -main [& _args] (start))