Log port when starting api; don't allow default worker port

SURFnet · Sep 19, 2024 · e31cfd8 · e31cfd8
1 parent 6437286
commit e31cfd8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git 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
@@ -17,7 +17,8 @@
 ;; <https://www.gnu.org/licenses/>.
 
 (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))
diff --git a/test/nl/surf/eduhub_rio_mapper/e2e_test.clj b/test/nl/surf/eduhub_rio_mapper/e2e_test.clj
@@ -25,6 +25,12 @@
 
 (use-fixtures :once with-running-mapper remote-entities-fixture)
 
+(deftest ^:e2e test-env-variables
+  (let [worker-api-port (System/getenv "WORKER_API_PORT")]
+    (if (nil? worker-api-port)
+      (println "WORKER_API_PORT is not set")
+      (println "WORKER_API_PORT is set to" worker-api-port))))
+
 (deftest ^:e2e create-edspecs-and-program
   (testing "create edspecs"
     (testing "scenario [1a]: Test /job/dry-run to see the difference between the edspec parent in OOAPI en de opleidingeenheid in RIO. You can expect RIO to be empty, when you start fresh."