From 8aab0a137390c0290d513c9241e63133639d5778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Herbel?= Date: Tue, 26 Nov 2024 15:11:08 +0100 Subject: [PATCH] Make handling of cancellation more consistent in `main::run`. Return `Terminate::Cancelled` and the actual main function do the rest. --- src/bin/scheduler/main.rs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/bin/scheduler/main.rs b/src/bin/scheduler/main.rs index 17ac859a..77d17eb2 100644 --- a/src/bin/scheduler/main.rs +++ b/src/bin/scheduler/main.rs @@ -51,8 +51,7 @@ fn run() -> Result<(), Terminate> { ); if global_config.cancellation_token.is_cancelled() { - info!("Terminated"); - return Ok(()); + return Err(Terminate::Cancelled); } if let Some(grace_period) = args.grace_period { @@ -70,8 +69,7 @@ fn run() -> Result<(), Terminate> { info!("Setup steps completed"); if global_config.cancellation_token.is_cancelled() { - info!("Terminated"); - return Ok(()); + return Err(Terminate::Cancelled); } info!("Starting environment building"); @@ -80,15 +78,14 @@ fn run() -> Result<(), Terminate> { info!("Environment building finished"); if global_config.cancellation_token.is_cancelled() { - info!("Terminated"); - return Ok(()); + return Err(Terminate::Cancelled); } info!("Starting plan scheduling"); write_phase(&SchedulerPhase::Scheduling, &global_config)?; scheduling::scheduler::run_plans_and_cleanup(&global_config, &plans); - info!("Terminated"); - Ok(()) + + Err(Terminate::Cancelled) } fn write_phase(