📎 Port fixes from main branch

This commit is contained in:
Andrey Antukh 2022-03-07 23:22:05 +01:00 committed by Andrés Moya
parent 43cbe2dd39
commit 965148f3a6
22 changed files with 136 additions and 104 deletions

View file

@ -57,8 +57,8 @@
[{:stream labels
:values [[(str (* (inst-ms (:created-at event)) 1000000))
(str (:message event)
(when-let [error (:error event)]
(str "\n" (:trace error))))]]}]}))
(when-let [error (:trace event)]
(str "\n" error)))]]}]}))
(defn- send-log
[{:keys [http-client uri]} payload i]

View file

@ -608,7 +608,8 @@
(db/update! conn :profile
{:props (db/tjson props)}
{:id profile-id})
nil)))
(profile/filter-profile-props props))))
;; --- MUTATION: Delete Profile

View file

@ -75,7 +75,7 @@
[conn profile]
(merge profile (retrieve-additional-data conn (:id profile))))
(defn- filter-profile-props
(defn filter-profile-props
[props]
(into {} (filter (fn [[k _]] (simple-ident? k))) props))