Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-10 00:40:30 -05:00
Code Issues Activity

Merge remote-tracking branch 'origin/main' into develop

Browse source
This commit is contained in:
Andrey Antukh 2021-03-10 10:21:39 +01:00
commit 6e1e3772b9
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/resources/log4j2.xml
View file

@ -23,6 +23,7 @@
<Logger name="com.zaxxer.hikari" level="error"/> <Logger name="com.zaxxer.hikari" level="error"/>
<Logger name="io.lettuce" level="error" /> <Logger name="io.lettuce" level="error" />
<Logger name="org.eclipse.jetty" level="error" /> <Logger name="org.eclipse.jetty" level="error" />
<Logger name="org.postgresql" level="error" />
<Logger name="app.cli" level="debug" additivity="false"> <Logger name="app.cli" level="debug" additivity="false">
<AppenderRef ref="console"/> <AppenderRef ref="console"/>
@ -32,7 +33,7 @@
<AppenderRef ref="main" level="debug" /> <AppenderRef ref="main" level="debug" />
</Logger> </Logger>
<Logger name="app" level="debug" additivity="false"> <Logger name="app" level="all" additivity="false">
<AppenderRef ref="main" level="trace" /> <AppenderRef ref="main" level="trace" />
<AppenderRef ref="zmq" level="debug" /> <AppenderRef ref="zmq" level="debug" />
</Logger> </Logger>

2
backend/scripts/repl
View file

@ -2,7 +2,7 @@
export PENPOT_ASSERTS_ENABLED=true export PENPOT_ASSERTS_ENABLED=true
export OPTIONS="-A:jmx-remote:dev -J-Dclojure.tools.logging.factory=clojure.tools.logging.impl/log4j2-factory -J-Xms512m -J-Xmx512m" export OPTIONS="-A:jmx-remote:dev -J-Dclojure.tools.logging.factory=clojure.tools.logging.impl/log4j2-factory -J-Djava.util.logging.manager=org.apache.logging.log4j.jul.LogManager -J-Xms512m -J-Xmx512m"
export OPTIONS_EVAL="nil" export OPTIONS_EVAL="nil"
# export OPTIONS_EVAL="(set! *warn-on-reflection* true)" # export OPTIONS_EVAL="(set! *warn-on-reflection* true)"

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

@ -147,7 +147,7 @@
(mcnt :inc) (mcnt :inc)
(if (ex/exception? result) (if (ex/exception? result)
(log/error result "updater: unexpected error on update sessions") (log/error result "updater: unexpected error on update sessions")
(log/tracef "updater: updated %s sessions (reason: %s)." result (name reason))) (log/debugf "updater: updated %s sessions (reason: %s)." result (name reason)))
(recur)))))) (recur))))))
(defn- timeout-chan (defn- timeout-chan

16
backend/src/app/rpc/queries/profile.clj
View file

@ -13,10 +13,8 @@
[app.common.spec :as us] [app.common.spec :as us]
[app.common.uuid :as uuid] [app.common.uuid :as uuid]
[app.db :as db] [app.db :as db]
[app.db.sql :as sql]
[app.util.services :as sv] [app.util.services :as sv]
[clojure.spec.alpha :as s] [clojure.spec.alpha :as s]))
[cuerdas.core :as str]))
;; --- Helpers & Specs ;; --- Helpers & Specs
@ -97,12 +95,16 @@
profile)) profile))
(def sql:retrieve-profile-by-email
"select p.* from profile as p
where p.email = lower(?)
and p.deleted_at is null")
(defn retrieve-profile-data-by-email (defn retrieve-profile-data-by-email
[conn email] [conn email]
(let [sql (sql/select :profile {:email (str/lower email)}) (let [sql [sql:retrieve-profile-by-email email]]
data (db/exec-one! conn sql)] (some-> (db/exec-one! conn sql)
(when (and data (nil? (:deleted-at data))) (decode-profile-row))))
(decode-profile-row data))))
;; --- Attrs Helpers ;; --- Attrs Helpers

2
frontend/src/app/main/ui/components/forms.cljs
View file

@ -23,7 +23,7 @@
(mf/defc input (mf/defc input
[{:keys [label help-icon disabled form hint trim] :as props}] [{:keys [label help-icon disabled form hint trim] :as props}]
(let [input-type (get props :type) (let [input-type (get props :type "text")
input-name (get props :name) input-name (get props :name)
more-classes (get props :class) more-classes (get props :class)