Merge branch 'more-trace-output' into master

3 files changed, 9 insertions, 4 deletions

diff --git a/src/commands/source.rs b/src/commands/source.rs
index 404d9f7..f3f65a4 100644
--- a/src/commands/source.rs
+++ b/src/commands/source.rs
@@ -72,7 +72,8 @@ pub async fn verify(
                 .as_ref()
                 .map(|v| v.matches(p.version()))
                 .unwrap_or(true)
-        });
+        })
+        .inspect(|p| trace!("Found for verification: {} {}", p.name(), p.version()));
 
     verify_impl(packages, &sc, &progressbars).await
 }
diff --git a/src/job/runnable.rs b/src/job/runnable.rs
index f91de5b..9806939 100644
--- a/src/job/runnable.rs
+++ b/src/job/runnable.rs
@@ -15,6 +15,7 @@ use anyhow::Context;
 use anyhow::Result;
 use getset::Getters;
 use log::debug;
+use log::trace;
 use uuid::Uuid;
 
 use crate::config::Configuration;
@@ -76,6 +77,7 @@ impl RunnableJob {
                 .into_iter()
                 .inspect(|(name, _)| debug!("Checking: {}", name))
                 .try_for_each(|(name, _)| {
+                    trace!("{:?} contains? {:?}", config.containers().allowed_env(), name);
                     if !config.containers().allowed_env().contains(&name) {
                         Err(anyhow!("Environment variable name not allowed: {}", name))
                     } else {
@@ -94,6 +96,7 @@ impl RunnableJob {
             debug!("Environment checking disabled");
         }
 
+        debug!("Building script now");
         let script = ScriptBuilder::new(&job.script_shebang).build(
             &job.package,
             &job.script_phases,
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...")),