From bfb77d6a0849cdf04f511160fc00c84ab3e24a61 Mon Sep 17 00:00:00 2001
From: ElysaSrc <101974839+ElysaSrc@users.noreply.github.com>
Date: Wed, 17 Jul 2024 15:52:11 +0200
Subject: [PATCH] core: cleanup check

---
 core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt | 11 +++++------
 1 file changed, 5 insertions(+), 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
index 90ca83572f7..499e058b616 100644
--- a/core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt
+++ b/core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt
@@ -44,16 +44,16 @@ 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:password@127.0.0.1:5672/%2f"
         WORKER_POOL = System.getenv("WORKER_POOL") ?: "core"
         WORKER_REQUESTS_QUEUE = System.getenv("WORKER_REQUESTS_QUEUE") ?: "$WORKER_POOL-req-$WORKER_KEY"
@@ -61,8 +61,7 @@ class WorkerCommand : CliCommand {
     }
 
     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.")
         }