mirror of
https://github.com/serokell/deploy-rs.git
synced 2024-09-11 02:35:39 +03:00
[#245] Return non-zero exit code in case of confirmation timeout
Problem: When profile activation confirmation fails due to confirmation timeout and performs a rollback, zero exit code is returned. Such a behavior is confusing since rollback usually means something went wrong during deployment and it shouldn't return successful exit code. Solution: Explicitly return confirmation waiting error instead of printing it and silently signalizing success.
This commit is contained in:
parent
660180bbbe
commit
b076e35c4a
@ -229,6 +229,8 @@ pub enum ActivationConfirmationError {
|
||||
CreateConfirmFile(std::io::Error),
|
||||
#[error("Could not watch for activation sentinel: {0}")]
|
||||
Watcher(#[from] notify::Error),
|
||||
#[error("Error waiting for confirmation event: {0}")]
|
||||
WaitingError(#[from] DangerZoneError),
|
||||
}
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
@ -256,7 +258,6 @@ async fn danger_zone(
|
||||
}
|
||||
|
||||
pub async fn activation_confirmation(
|
||||
profile_path: String,
|
||||
temp_path: PathBuf,
|
||||
confirm_timeout: u16,
|
||||
closure: String,
|
||||
@ -302,18 +303,9 @@ pub async fn activation_confirmation(
|
||||
|
||||
watcher.watch(&lock_path, RecursiveMode::NonRecursive)?;
|
||||
|
||||
if let Err(err) = danger_zone(done, confirm_timeout).await {
|
||||
error!("Error waiting for confirmation event: {}", err);
|
||||
|
||||
if let Err(err) = deactivate(&profile_path).await {
|
||||
error!(
|
||||
"Error de-activating due to another error waiting for confirmation, oh no...: {}",
|
||||
err
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
danger_zone(done, confirm_timeout)
|
||||
.await
|
||||
.map_err(|err| ActivationConfirmationError::WaitingError(err))
|
||||
}
|
||||
|
||||
#[derive(Error, Debug)]
|
||||
@ -463,16 +455,10 @@ pub async fn activate(
|
||||
|
||||
if magic_rollback && !boot {
|
||||
info!("Magic rollback is enabled, setting up confirmation hook...");
|
||||
|
||||
match activation_confirmation(profile_path.clone(), temp_path, confirm_timeout, closure)
|
||||
.await
|
||||
{
|
||||
Ok(()) => {}
|
||||
Err(err) => {
|
||||
deactivate(&profile_path).await?;
|
||||
return Err(ActivateError::ActivationConfirmation(err));
|
||||
}
|
||||
};
|
||||
if let Err(err) = activation_confirmation(temp_path, confirm_timeout, closure).await {
|
||||
deactivate(&profile_path).await?;
|
||||
return Err(ActivateError::ActivationConfirmation(err));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user