diff --git a/backend/resources/log4j2.xml b/backend/resources/log4j2.xml index acfa8c7a9..0c7dca017 100644 --- a/backend/resources/log4j2.xml +++ b/backend/resources/log4j2.xml @@ -23,6 +23,7 @@ + @@ -32,7 +33,7 @@ - + diff --git a/backend/scripts/repl b/backend/scripts/repl index 147661f35..cfbf661f4 100755 --- a/backend/scripts/repl +++ b/backend/scripts/repl @@ -2,7 +2,7 @@ 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="(set! *warn-on-reflection* true)" diff --git a/backend/src/app/http/session.clj b/backend/src/app/http/session.clj index 0c047b310..bb5afecc5 100644 --- a/backend/src/app/http/session.clj +++ b/backend/src/app/http/session.clj @@ -147,7 +147,7 @@ (mcnt :inc) (if (ex/exception? result) (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)))))) (defn- timeout-chan diff --git a/backend/src/app/rpc/queries/profile.clj b/backend/src/app/rpc/queries/profile.clj index 59ed2e8b0..29fb1124b 100644 --- a/backend/src/app/rpc/queries/profile.clj +++ b/backend/src/app/rpc/queries/profile.clj @@ -13,10 +13,8 @@ [app.common.spec :as us] [app.common.uuid :as uuid] [app.db :as db] - [app.db.sql :as sql] [app.util.services :as sv] - [clojure.spec.alpha :as s] - [cuerdas.core :as str])) + [clojure.spec.alpha :as s])) ;; --- Helpers & Specs @@ -97,12 +95,16 @@ 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 [conn email] - (let [sql (sql/select :profile {:email (str/lower email)}) - data (db/exec-one! conn sql)] - (when (and data (nil? (:deleted-at data))) - (decode-profile-row data)))) + (let [sql [sql:retrieve-profile-by-email email]] + (some-> (db/exec-one! conn sql) + (decode-profile-row)))) ;; --- Attrs Helpers diff --git a/frontend/src/app/main/ui/components/forms.cljs b/frontend/src/app/main/ui/components/forms.cljs index 1df0408bb..915f5faa2 100644 --- a/frontend/src/app/main/ui/components/forms.cljs +++ b/frontend/src/app/main/ui/components/forms.cljs @@ -23,7 +23,7 @@ (mf/defc input [{: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) more-classes (get props :class)