serokell/deploy-rs
1
1
Fork 0
mirror of https://github.com/serokell/deploy-rs.git synced 2024-11-26 08:09:53 +03:00
Code Issues Projects Releases Wiki Activity

Fail correctly if initial activation fails

Browse Source
This commit is contained in:
notgne2 2020-10-25 13:15:35 -07:00
parent 73d14d456f
commit 155f4bf452
No known key found for this signature in database
GPG Key ID: BB661E172B42A7F8
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/activate.rs
View File

@ -114,7 +114,7 @@ pub async fn deactivate(profile_path: &str) -> Result<(), Box<dyn std::error::Er
good_panic!("Failed to delete failed generation");
}
info!("Attempting re-activate last generation");
info!("Attempting to re-activate the last generation");
let re_activate_exit_status = Command::new(format!("{}/deploy-rs-activate", profile_path))
.env("PROFILE", &profile_path)
@ -255,11 +255,13 @@ pub async fn activate(
.status()
.await;
match activate_status {
Ok(s) if s.success() => (),
_ if auto_rollback => return Ok(deactivate(&profile_path).await?),
_ => (),
}
let activate_status_all = match activate_status {
Ok(s) if s.success() => Ok(()),
Ok(_) => Err(std::io::Error::new(std::io::ErrorKind::Other, "Activation did not succeed")),
Err(x) => Err(x),
};
deactivate_on_err(&profile_path, activate_status_all).await;
info!("Activation succeeded!");