Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-09 00:28:20 -05:00
Code Issues Activity

🎉 Add metrics to notification service.

Browse source
This commit is contained in:
Andrey Antukh 2021-01-19 13:58:03 +01:00 • committed by Alonso Torres
parent d494e44df3
commit d8ee07d1e4
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/src/app/main.clj
View file

@ -105,7 +105,8 @@
:app.notifications/handler :app.notifications/handler
{:redis (ig/ref :app.redis/redis) {:redis (ig/ref :app.redis/redis)
:pool (ig/ref :app.db/pool) :pool (ig/ref :app.db/pool)
:session (ig/ref :app.http.session/session)} :session (ig/ref :app.http.session/session)
:metrics (ig/ref :app.metrics/metrics)}
:app.http.auth/google :app.http.auth/google
{:rpc (ig/ref :app.rpc/rpc) {:rpc (ig/ref :app.rpc/rpc)

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

@ -5,7 +5,7 @@
;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; This Source Code Form is "Incompatible With Secondary Licenses", as
;; defined by the Mozilla Public License, v. 2.0. ;; defined by the Mozilla Public License, v. 2.0.
;; ;;
;; Copyright (c) 2020 UXBOX Labs SL ;; Copyright (c) 2020-2021 UXBOX Labs SL
(ns app.notifications (ns app.notifications
"A websocket based notifications mechanism." "A websocket based notifications mechanism."
@ -36,11 +36,24 @@
(s/def ::session map?) (s/def ::session map?)
(defmethod ig/pre-init-spec ::handler [_] (defmethod ig/pre-init-spec ::handler [_]
(s/keys :req-un [::rd/redis ::db/pool ::session])) (s/keys :req-un [::rd/redis ::db/pool ::session ::mtx/metrics]))
(defmethod ig/init-key ::handler (defmethod ig/init-key ::handler
[_ {:keys [session] :as cfg}] [_ {:keys [session metrics] :as cfg}]
(let [wrap-session (:middleware session)] (let [wrap-session (:middleware session)
mtx-active-conn (mtx/create
{:name "http_ws_notifications_active_connections"
:registry (:registry metrics)
:type :gauge
:help "Active websocket connections on notifications service."})
mtx-msg-counter (mtx/create
{:name "http_ws_notifications_message_counter"
:registry (:registry metrics)
:type :counter
:help "Counter of total messages processed on websocket conenction on notifications service."})
cfg (assoc cfg
:mtx-active-conn mtx-active-conn
:mtx-msg-counter mtx-msg-counter)]
(-> #(handler cfg %) (-> #(handler cfg %)
(wrap-session) (wrap-session)
(wrap-keyword-params) (wrap-keyword-params)
@ -109,12 +122,12 @@
false))) false)))
(defn websocket (defn websocket
[{:keys [file-id team-id redis] :as cfg}] [{:keys [file-id team-id redis mtx-active-conn mtx-msg-counter] :as cfg}]
(let [in (a/chan 32) (let [in (a/chan 32)
out (a/chan 32)] out (a/chan 32)]
{:on-connect {:on-connect
(fn [conn] (fn [conn]
;; (metrics-active-connections :inc) (mtx-active-conn :inc)
(let [sub (rd/subscribe redis {:xform (map t/decode-str) (let [sub (rd/subscribe redis {:xform (map t/decode-str)
:topics [file-id team-id]}) :topics [file-id team-id]})
ws (WebSocket. conn in out sub nil cfg)] ws (WebSocket. conn in out sub nil cfg)]
@ -137,13 +150,13 @@
:on-close :on-close
(fn [_conn _status _reason] (fn [_conn _status _reason]
;; (metrics-active-connections :dec) (mtx-active-conn :dec)
(a/close! out) (a/close! out)
(a/close! in)) (a/close! in))
:on-text :on-text
(fn [_ws message] (fn [_ws message]
;; (metrics-message-counter :inc) (mtx-msg-counter :inc)
(let [message (t/decode-str message)] (let [message (t/decode-str message)]
(a/>!! in message))) (a/>!! in message)))