summaryrefslogtreecommitdiffstats
path: root/src/orchestrator
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2021-02-02 09:47:41 +0100
committerMatthias Beyer <mail@beyermatthias.de>2021-02-02 09:47:41 +0100
commit928b85f24bee213442a596675143eb06a29b1550 (patch)
treed31b5a83b7c47b6e42503e7315221ddedcaa0e18 /src/orchestrator
parent24ed1e7f41279a8f61684b8b1e216e547620a206 (diff)
parentfe14813d7092b91e5ac586e601c20443959c59e6 (diff)
Merge branch 'more-trace-output' into master
Diffstat (limited to 'src/orchestrator')
-rw-r--r--src/orchestrator/orchestrator.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/orchestrator/orchestrator.rs b/src/orchestrator/orchestrator.rs
index 00cec75..ecd994a 100644
--- a/src/orchestrator/orchestrator.rs
+++ b/src/orchestrator/orchestrator.rs
@@ -18,6 +18,7 @@ use anyhow::Result;
use anyhow::anyhow;
use diesel::PgConnection;
use indicatif::ProgressBar;
+use log::debug;
use log::trace;
use tokio::sync::RwLock;
use tokio::sync::mpsc::Receiver;
@@ -311,11 +312,11 @@ impl<'a> Orchestrator<'a> {
}
})
.map(|task| task.run())
- .collect::<futures::stream::FuturesUnordered<_>>()
- .collect::<Result<()>>();
+ .collect::<futures::stream::FuturesUnordered<_>>();
+ debug!("Built {} jobs", running_jobs.len());
let multibar_block = tokio::task::spawn_blocking(move || multibar.join());
- let (_, jobs_result) = tokio::join!(multibar_block, running_jobs);
+ let (_, jobs_result) = tokio::join!(multibar_block, running_jobs.collect::<Result<()>>());
let _ = jobs_result?;
match root_receiver.recv().await {
None => Err(anyhow!("No result received...")),