From 124bd452ab5438ec55317473c727198d8eb225ee Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 31 Jul 2022 20:23:03 +0200 Subject: [PATCH] report flow for whom the fetching error is happening --- backend/src/worker.rs | 10 ++++++---- backend/src/worker_flow.rs | 6 +++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/src/worker.rs b/backend/src/worker.rs index dca2c0bef9..9c9efa8708 100644 --- a/backend/src/worker.rs +++ b/backend/src/worker.rs @@ -126,13 +126,15 @@ pub async fn run_worker( .err() { let err_string = err.to_string().clone(); - let _ = add_completed_job_error( + let m = add_completed_job_error( db, &job2, "Unexpected error during job execution:\n".to_string(), err, ) - .await; + .await + .map(|(_, m)| m) + .unwrap_or_else(|_| Map::new()); { let job = job2.clone(); @@ -147,8 +149,8 @@ pub async fn run_worker( } if job2.parent_job.is_some() { - let _ = - update_flow_status_after_job_completion(db, &job2, false, None).await; + let _ = update_flow_status_after_job_completion(db, &job2, false, Some(m)) + .await; } tracing::error!(job_id = %job2.id, "Error handling job: {err_string}"); }; diff --git a/backend/src/worker_flow.rs b/backend/src/worker_flow.rs index 406d60df2a..62d373f9ff 100644 --- a/backend/src/worker_flow.rs +++ b/backend/src/worker_flow.rs @@ -67,7 +67,11 @@ pub async fn update_flow_status_after_job_completion( ) .fetch_one(&mut tx) .await - .map_err(|e| Error::InternalErr(format!("fetching flow status {flow}: {e}")))? + .map_err(|e| { + Error::InternalErr(format!( + "fetching flow status {flow} while reporting {success} {result:?}: {e}" + )) + })? .ok_or_else(|| Error::InternalErr(format!("requiring a previous status")))?; let old_status = serde_json::from_value::(old_status_json)