diff options
author | Matthias Beyer <matthias.beyer@atos.net> | 2021-09-23 12:55:07 +0200 |
---|---|---|
committer | Matthias Beyer <matthias.beyer@atos.net> | 2021-09-23 12:55:07 +0200 |
commit | 19b2e31c67a190449a7bd398df3eb5a465463a85 (patch) | |
tree | b196fad8383d93cbe759eecddb2069888d25c511 /src/orchestrator/orchestrator.rs | |
parent | 42cba81a9f23bb82372cd54791cc456a6a40b56c (diff) | |
parent | b1137c967130715d68b40b332151d913be6ebbab (diff) |
Merge branch 'received-errors-fmt'
Diffstat (limited to 'src/orchestrator/orchestrator.rs')
-rw-r--r-- | src/orchestrator/orchestrator.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/orchestrator/orchestrator.rs b/src/orchestrator/orchestrator.rs index 0f2e528..3493403 100644 --- a/src/orchestrator/orchestrator.rs +++ b/src/orchestrator/orchestrator.rs @@ -43,6 +43,7 @@ use crate::filestore::StagingStore; use crate::job::Dag; use crate::job::JobDefinition; use crate::job::RunnableJob; +use crate::orchestrator::util::*; use crate::source::SourceCache; use crate::util::EnvironmentVariableName; use crate::util::progress::ProgressBars; @@ -591,14 +592,14 @@ impl<'a> JobTask<'a> { // receive from the receiver let continue_receiving = self.perform_receive(&mut received_dependencies, &mut received_errors).await?; - trace!("[{}]: Received errors = {:?}", self.jobdef.job.uuid(), received_errors); + trace!("[{}]: Received errors = {}", self.jobdef.job.uuid(), received_errors.display_error_map()); // if there are any errors from child tasks if !received_errors.is_empty() { // send them to the parent,... // // We only send to one parent, because it doesn't matter // And we know that we have at least one sender - log::error!("[{}]: Received errors = {:?}", self.jobdef.job.uuid(), received_errors); + log::error!("[{}]: Received errors = {}", self.jobdef.job.uuid(), received_errors.display_error_map()); self.sender[0].send(Err(received_errors)).await; // ... and stop operation, because the whole tree will fail anyways. |