core: cleanup check

OpenRailAssociation · Jul 17, 2024 · bfb77d6 · bfb77d6
1 parent e3b41bd
commit bfb77d6
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt b/core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt
@@ -44,25 +44,24 @@ class WorkerCommand : CliCommand {
     private var threads: Int = 1
 
 
-    val WORKER_ID: String
-    val WORKER_KEY: String
+    val WORKER_ID: String?
+    val WORKER_KEY: String?
     val WORKER_AMQP_URI: String
     val WORKER_POOL: String
     val WORKER_REQUESTS_QUEUE: String
     val WORKER_ACTIVITY_EXCHANGE: String
 
     init {
-        WORKER_ID = System.getenv("WORKER_ID") ?: "worker_id_undefined"
-        WORKER_KEY = System.getenv("WORKER_KEY") ?: "worker_key_undefined"
+        WORKER_ID = System.getenv("WORKER_ID")
+        WORKER_KEY = System.getenv("WORKER_KEY")
         WORKER_AMQP_URI = System.getenv("WORKER_AMQP_URI") ?: "amqp://osrd:[email protected]:5672/%2f"
         WORKER_POOL = System.getenv("WORKER_POOL") ?: "core"
         WORKER_REQUESTS_QUEUE = System.getenv("WORKER_REQUESTS_QUEUE") ?: "$WORKER_POOL-req-$WORKER_KEY"
         WORKER_ACTIVITY_EXCHANGE = System.getenv("WORKER_ACTIVITY_EXCHANGE") ?: "$WORKER_POOL-activity-xchg"
     }
 
     override fun run(): Int {
-        if (WORKER_ID == "worker_id_undefined" || WORKER_KEY == "worker_key_undefined") {
-            // TODO (Élyse): Check if this ok with Khoyo
+        if (WORKER_ID == null || WORKER_KEY == null) {
             throw IllegalStateException("Environment variables WORKER_ID or WORKER_KEY are not set properly.")
         }