🔥 Remove unused config variables.

This commit is contained in:
Andrey Antukh 2021-01-29 11:00:54 +01:00 committed by Hirunatan
parent b44dfc2d9d
commit 393c9cd13c
5 changed files with 11 additions and 21 deletions

View file

@ -19,12 +19,12 @@
(def defaults
{:http-server-port 6060
:http-server-cors "http://localhost:3449"
:database-uri "postgresql://127.0.0.1/penpot"
:database-username "penpot"
:database-password "penpot"
:asserts-enabled true
:asserts-enabled false
:public-uri "http://localhost:3449"
:redis-uri "redis://localhost/0"
@ -52,10 +52,9 @@
:registration-domain-whitelist ""
:telemetry-enabled false
:telemetry-with-taiga true
:telemetry-uri "https://telemetry.penpot.app/"
:debug true
;; LDAP auth disabled by default. Set ldap-auth-host to enable
;:ldap-auth-host "ldap.mysupercompany.com"
;:ldap-auth-port 389
@ -76,8 +75,6 @@
})
(s/def ::http-server-port ::us/integer)
(s/def ::http-server-debug ::us/boolean)
(s/def ::http-server-cors ::us/string)
(s/def ::database-username (s/nilable ::us/string))
(s/def ::database-password (s/nilable ::us/string))
(s/def ::database-uri ::us/string)
@ -106,7 +103,6 @@
(s/def ::allow-demo-users ::us/boolean)
(s/def ::registration-enabled ::us/boolean)
(s/def ::registration-domain-whitelist ::us/string)
(s/def ::debug ::us/boolean)
(s/def ::public-uri ::us/string)
(s/def ::srepl-host ::us/string)
@ -153,7 +149,6 @@
::database-password
::database-uri
::database-username
::debug
::error-report-webhook
::github-client-id
::github-client-secret
@ -162,9 +157,7 @@
::gitlab-client-secret
::google-client-id
::google-client-secret
::http-server-debug
::http-server-port
::http-server-cors
::ldap-auth-avatar-attribute
::ldap-auth-base-dn
::ldap-auth-email-attribute

View file

@ -5,12 +5,11 @@
;; This Source Code Form is "Incompatible With Secondary Licenses", as
;; defined by the Mozilla Public License, v. 2.0.
;;
;; Copyright (c) 2020 UXBOX Labs SL
;; Copyright (c) 2020-2021 UXBOX Labs SL
(ns app.http.middleware
(:require
[app.common.exceptions :as ex]
[app.config :as cfg]
[app.metrics :as mtx]
[app.util.transit :as t]
[app.util.json :as json]
@ -47,7 +46,7 @@
:json (parse-json body)
:transit (parse-transit body))
(catch Exception e
(let [type (if (:debug @cfg/config) :json-verbose :json)
(let [type :json-verbose
data {:type :parse
:hint "unable to parse request body"
:message (ex-message e)}]
@ -80,7 +79,7 @@
(defn- impl-format-response-body
[response]
(let [body (:body response)
type (if (:debug cfg/config) :json-verbose :json)]
type :json-verbose]
(cond
(coll? body)
(-> response