From e4b3d6ed53c89f2ba0a70be7554d56e8d5b781f1 Mon Sep 17 00:00:00 2001 From: Michiel de Mare Date: Wed, 18 Sep 2024 14:48:26 +0200 Subject: [PATCH] Log port when starting api; don't allow default worker port --- src/nl/surf/eduhub_rio_mapper/config.clj | 2 +- src/nl/surf/eduhub_rio_mapper/endpoints/api.clj | 2 ++ src/nl/surf/eduhub_rio_mapper/endpoints/worker_api.clj | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/nl/surf/eduhub_rio_mapper/config.clj b/src/nl/surf/eduhub_rio_mapper/config.clj index 54d24a16..0a3b10ca 100644 --- a/src/nl/surf/eduhub_rio_mapper/config.clj +++ b/src/nl/surf/eduhub_rio_mapper/config.clj @@ -83,7 +83,7 @@ :default "localhost" :in [:api-config :host]] :worker-api-port ["HTTP port for serving web API" :int - :default 8080 + ;:default 8080 :in [:worker-api-config :port]] :worker-api-hostname ["Hostname for listing web API" :str :default "localhost" diff --git a/src/nl/surf/eduhub_rio_mapper/endpoints/api.clj b/src/nl/surf/eduhub_rio_mapper/endpoints/api.clj index 51b7b3cc..afdefa69 100644 --- a/src/nl/surf/eduhub_rio_mapper/endpoints/api.clj +++ b/src/nl/surf/eduhub_rio_mapper/endpoints/api.clj @@ -19,6 +19,7 @@ (ns nl.surf.eduhub-rio-mapper.endpoints.api (:require [clojure.spec.alpha :as s] [clojure.string :as str] + [clojure.tools.logging :as log] [compojure.core :refer [GET POST]] [compojure.route :as route] [nl.jomco.http-status-codes :as http-status] @@ -250,5 +251,6 @@ (defn serve-api [{{:keys [^Integer port host]} :api-config :as config}] + (log/info (str "Starting api on port " port)) (.addShutdownHook (Runtime/getRuntime) (new Thread ^Runnable shutdown-handler)) (app-server/run-jetty (make-app config) host port)) diff --git a/src/nl/surf/eduhub_rio_mapper/endpoints/worker_api.clj b/src/nl/surf/eduhub_rio_mapper/endpoints/worker_api.clj index 1bdee3be..d0ef17f9 100644 --- a/src/nl/surf/eduhub_rio_mapper/endpoints/worker_api.clj +++ b/src/nl/surf/eduhub_rio_mapper/endpoints/worker_api.clj @@ -17,7 +17,8 @@ ;; . (ns nl.surf.eduhub-rio-mapper.endpoints.worker-api - (:require [compojure.core :refer [GET]] + (:require [clojure.tools.logging :as log] + [compojure.core :refer [GET]] [compojure.route :as route] [nl.jomco.ring-trace-context :refer [wrap-trace-context]] [nl.surf.eduhub-rio-mapper.endpoints.app-server :as app-server] @@ -47,4 +48,5 @@ (defn serve-api [{{:keys [^Integer port host]} :worker-api-config :as config}] + (log/info (str "Starting worker api on port " port)) (app-server/run-jetty (make-app config) host port))