diff --git a/backend/src/app/loggers/loki.clj b/backend/src/app/loggers/loki.clj index c29e394b4..4f615c495 100644 --- a/backend/src/app/loggers/loki.clj +++ b/backend/src/app/loggers/loki.clj @@ -10,35 +10,34 @@ [app.common.logging :as l] [app.common.spec :as us] [app.config :as cfg] - [app.util.async :as aa] [app.util.json :as json] - [app.worker :as wrk] [clojure.core.async :as a] [clojure.spec.alpha :as s] [integrant.core :as ig])) -(declare handle-event) +(declare ^:private handle-event) +(declare ^:private start-rcv-loop) (s/def ::uri ::us/string) (s/def ::receiver fn?) +(s/def ::http-client fn?) (defmethod ig/pre-init-spec ::reporter [_] - (s/keys :req-un [::wrk/executor ::receiver] + (s/keys :req-un [ ::receiver ::http-client] :opt-un [::uri])) (defmethod ig/init-key ::reporter [_ {:keys [receiver uri] :as cfg}] (when uri (l/info :msg "initializing loki reporter" :uri uri) - (let [input (a/chan (a/dropping-buffer 512))] + (let [input (a/chan (a/dropping-buffer 2048))] (receiver :sub input) - (a/go-loop [] - (let [msg (a/ event :thrown :extended-stack-trace)] + {:trace trace}) (:context-map event)) (do diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 85c13749c..7b54ad9f7 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -314,9 +314,9 @@ :pool (ig/ref :app.db/pool)} :app.loggers.loki/reporter - {:uri (cf/get :loggers-loki-uri) - :receiver (ig/ref :app.loggers.zmq/receiver) - :executor (ig/ref [::worker :app.worker/executor])} + {:uri (cf/get :loggers-loki-uri) + :receiver (ig/ref :app.loggers.zmq/receiver) + :http-client (ig/ref :app.http/client)} :app.loggers.mattermost/reporter {:uri (cf/get :error-report-webhook) diff --git a/common/src/app/common/logging.cljc b/common/src/app/common/logging.cljc index 451483e23..663f4beae 100644 --- a/common/src/app/common/logging.cljc +++ b/common/src/app/common/logging.cljc @@ -337,5 +337,3 @@ (glog/removeHandler l default-console-handler) (glog/addHandler l default-console-handler) nil))) - -