From 56cee29d68c5c54195426a7493198dc745799235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre-Etienne=20Bougu=C3=A9?= Date: Thu, 3 Oct 2024 15:58:14 +0200 Subject: [PATCH] fixup! docker, core, editoast: add mode single-worker for all infra --- core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 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 c57a931f81..f0fa2e6a72 100644 --- a/core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt +++ b/core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt @@ -2,7 +2,10 @@ package fr.sncf.osrd.cli import com.beust.jcommander.Parameter import com.beust.jcommander.Parameters -import com.rabbitmq.client.* +import com.rabbitmq.client.AMQP +import com.rabbitmq.client.Channel +import com.rabbitmq.client.ConnectionFactory +import com.rabbitmq.client.DeliverCallback import fr.sncf.osrd.api.* import fr.sncf.osrd.api.api_v2.conflicts.ConflictDetectionEndpointV2 import fr.sncf.osrd.api.api_v2.path_properties.PathPropEndpoint @@ -48,8 +51,8 @@ class WorkerCommand : CliCommand { init { ALL_INFRA = !System.getenv("ALL_INFRA").isNullOrEmpty() - WORKER_ID = System.getenv("WORKER_ID") ?: (if (ALL_INFRA) "all_infra_worker" else null) - WORKER_KEY = System.getenv("WORKER_KEY") ?: (if (ALL_INFRA) "all" else null) + WORKER_ID = if (ALL_INFRA) "all_infra_worker" else System.getenv("WORKER_ID") + WORKER_KEY = if (ALL_INFRA) "all" else 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"