3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-24 10:56:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix NPE on notifications module (on abrupt disconnect).

Browse source
This commit is contained in:
Andrey Antukh 2021-01-18 15:28:46 +01:00
parent 76b7272a72
commit 0f7372bfb4
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
backend/src/app/notifications.clj
View file

@ -99,6 +99,15 @@
;; (mtx/counter {:id "notificatons__messages_counter" ;; (mtx/counter {:id "notificatons__messages_counter"
;; :help "A total number of messages handled by the notifications service."})) ;; :help "A total number of messages handled by the notifications service."}))
(defn- ws-send
[conn data]
(try
(when (jetty/connected? conn)
(jetty/send! conn data)
true)
(catch java.lang.NullPointerException e
false)))
(defn websocket (defn websocket
[{:keys [file-id team-id redis] :as cfg}] [{:keys [file-id team-id redis] :as cfg}]
(let [in (a/chan 32) (let [in (a/chan 32)
@ -114,8 +123,8 @@
(a/go-loop [] (a/go-loop []
(let [val (a/<! out)] (let [val (a/<! out)]
(when-not (nil? val) (when-not (nil? val)
(jetty/send! conn (t/encode-str val)) (when (ws-send conn (t/encode-str val))
(recur)))) (recur)))))
(a/go (a/go
(a/<! (on-connect ws)) (a/<! (on-connect ws))