From a6ef6b00e050fad5023cf2ca519e8349c31de45d Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 2 Feb 2021 08:02:03 +0100 Subject: Add tracing output Signed-off-by: Matthias Beyer --- src/job/runnable.rs | 3 +++ 1 file changed, 3 insertions(+) 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, -- cgit v1.2.3 From 5a79b2ea5a7648741042fc118be7d98dffbd4b24 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 2 Feb 2021 08:02:03 +0100 Subject: Add tracing output Signed-off-by: Matthias Beyer --- src/orchestrator/orchestrator.rs | 7 ++++--- 1 file 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::>() - .collect::>(); + .collect::>(); + 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::>()); let _ = jobs_result?; match root_receiver.recv().await { None => Err(anyhow!("No result received...")), -- cgit v1.2.3 From fe14813d7092b91e5ac586e601c20443959c59e6 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 1 Feb 2021 11:12:25 +0100 Subject: Add trace output which packages will be verified Signed-off-by: Matthias Beyer --- src/commands/source.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 } -- cgit v1.2.3