ecoppens/colmena
1
0
Fork 0
forked from DGNum/colmena
Code Pull requests Activity

deployment: A few oops

Browse source
This commit is contained in:
Zhaofeng Li 2021-11-22 01:52:35 -08:00
parent 572f77dbf5
commit ec51f5703f
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/nix/deployment/mod.rs
View file

@ -335,6 +335,7 @@ impl Deployment {
job.state(JobState::Running)?; job.state(JobState::Running)?;
let host = target.host.as_mut().unwrap(); let host = target.host.as_mut().unwrap();
host.set_job(Some(job.clone()));
host.copy_closure( host.copy_closure(
push_profile.as_store_path(), push_profile.as_store_path(),
CopyDirection::ToRemote, CopyDirection::ToRemote,
@ -367,6 +368,7 @@ impl Deployment {
job.message("Uploading pre-activation keys...".to_string())?; job.message("Uploading pre-activation keys...".to_string())?;
let host = target.host.as_mut().unwrap(); let host = target.host.as_mut().unwrap();
host.set_job(Some(job.clone()));
host.upload_keys(&keys, false).await?; host.upload_keys(&keys, false).await?;
job.success_with_message("Uploaded keys (pre-activation)".to_string())?; job.success_with_message("Uploaded keys (pre-activation)".to_string())?;
@ -382,6 +384,7 @@ impl Deployment {
let profile_r = profile.clone(); let profile_r = profile.clone();
let mut target = activation_job.run(|job| async move { let mut target = activation_job.run(|job| async move {
let host = target.host.as_mut().unwrap(); let host = target.host.as_mut().unwrap();
host.set_job(Some(job.clone()));
if !target.config.replace_unknown_profiles { if !target.config.replace_unknown_profiles {
job.message("Checking remote profile...".to_string())?; job.message("Checking remote profile...".to_string())?;
@ -424,6 +427,7 @@ impl Deployment {
job.message("Uploading post-activation keys...".to_string())?; job.message("Uploading post-activation keys...".to_string())?;
let host = target.host.as_mut().unwrap(); let host = target.host.as_mut().unwrap();
host.set_job(Some(job.clone()));
host.upload_keys(&keys, true).await?; host.upload_keys(&keys, true).await?;
job.success_with_message("Uploaded keys (post-activation)".to_string())?; job.success_with_message("Uploaded keys (post-activation)".to_string())?;