diff --git a/backend/src/app/http.clj b/backend/src/app/http.clj index 4d5d9726c..2a3e7164e 100644 --- a/backend/src/app/http.clj +++ b/backend/src/app/http.clj @@ -5,11 +5,12 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.http (:require [app.common.spec :as us] + [app.common.data :as d] [app.config :as cfg] [app.http.auth :as auth] [app.http.errors :as errors] @@ -26,14 +27,20 @@ (s/def ::handler fn?) (s/def ::ws (s/map-of ::us/string fn?)) (s/def ::port ::cfg/http-server-port) +(s/def ::name ::us/string) (defmethod ig/pre-init-spec ::server [_] (s/keys :req-un [::handler ::port] - :opt-un [::ws])) + :opt-un [::ws ::name])) + +(defmethod ig/prep-key ::server + [_ cfg] + (merge {:name "http"} + (d/without-nils cfg))) (defmethod ig/init-key ::server - [_ {:keys [handler ws port] :as opts}] - (log/infof "Starting http server on port %s." port) + [_ {:keys [handler ws port name] :as opts}] + (log/infof "Starting %s server on port %s." name port) (let [options (merge {:port port :h2c? true @@ -47,11 +54,12 @@ (.setServer server))] (.setErrorHandler server handler) - server)) + + (assoc opts :server server))) (defmethod ig/halt-key! ::server - [_ server] - (log/info "Stoping http server.") + [_ {:keys [server name port] :as opts}] + (log/infof "Stoping %s server on port %s." name port) (.stop server)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 68c6ff3cf..ca820d9ad 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.main (:require @@ -198,7 +198,8 @@ :app.telemetry/server {:port (:telemetry-server-port config 6063) - :handler (ig/ref :app.telemetry/handler)}}))) + :handler (ig/ref :app.telemetry/handler) + :name "telemetry"}}))) (defmethod ig/init-key :default [_ data] data) diff --git a/backend/src/app/telemetry.clj b/backend/src/app/telemetry.clj index b86c508dd..c85fd3cdf 100644 --- a/backend/src/app/telemetry.clj +++ b/backend/src/app/telemetry.clj @@ -5,7 +5,7 @@ ;; This Source Code Form is "Incompatible With Secondary Licenses", as ;; defined by the Mozilla Public License, v. 2.0. ;; -;; Copyright (c) 2020 UXBOX Labs SL +;; Copyright (c) 2020-2021 UXBOX Labs SL (ns app.telemetry (:require