Skip to content

Commit

Permalink
core: force process exit on rabbit's cancel notifications
Browse files Browse the repository at this point in the history
From hand-tests, shutdown is already covered by the System.exit in
App.java::main().

Signed-off-by: Pierre-Etienne Bougué <[email protected]>
  • Loading branch information
bougue-pe committed Feb 6, 2025
1 parent c8bd86f commit 54ad82d
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions core/src/main/java/fr/sncf/osrd/cli/WorkerCommand.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ package fr.sncf.osrd.cli
import com.beust.jcommander.Parameter
import com.beust.jcommander.Parameters
import com.rabbitmq.client.*
import fr.sncf.osrd.api.*
import fr.sncf.osrd.api.ElectricalProfileSetManager
import fr.sncf.osrd.api.InfraLoadEndpoint
import fr.sncf.osrd.api.InfraManager
import fr.sncf.osrd.api.VersionEndpoint
import fr.sncf.osrd.api.api_v2.conflicts.ConflictDetectionEndpointV2
import fr.sncf.osrd.api.api_v2.path_properties.PathPropEndpoint
import fr.sncf.osrd.api.api_v2.pathfinding.PathfindingBlocksEndpointV2
Expand All @@ -20,6 +23,7 @@ import java.io.InputStream
import java.util.concurrent.LinkedBlockingQueue
import java.util.concurrent.ThreadPoolExecutor
import java.util.concurrent.TimeUnit
import kotlin.system.exitProcess
import okhttp3.OkHttpClient
import org.slf4j.Logger
import org.slf4j.LoggerFactory
Expand Down Expand Up @@ -303,7 +307,10 @@ class WorkerCommand : CliCommand {
executor.execute { callback(message) }
}
},
{ _ -> logger.error("consumer cancelled") },
{ _ ->
logger.error("consumer cancelled")
exitProcess(0)
},
{ consumerTag, e ->
logger.info("consume shutdown: {}, {}", consumerTag, e.toString())
}
Expand Down

0 comments on commit 54ad82d

Please sign in to comment.