From f5afd6e25de9eb52cb1df3d142d72335df0e9fb5 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Mon, 5 Feb 2024 12:41:41 +0100 Subject: [PATCH] improve debug info endpoint --- backend/windmill-api/src/jobs.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs index d6e9e4aa4c..93238dd5f8 100644 --- a/backend/windmill-api/src/jobs.rs +++ b/backend/windmill-api/src/jobs.rs @@ -450,7 +450,7 @@ async fn get_flow_job_debug_info( )); } let mut jobs = HashMap::new(); - jobs.insert("root_job".to_string(), job.clone()); + jobs.insert("root_job".to_string(), Job::QueuedJob(job.clone())); let mut job_ids = vec![]; let jobs_with_root = sqlx::query_scalar!( @@ -476,9 +476,9 @@ async fn get_flow_job_debug_info( } } for job_id in job_ids { - let job = get_queued_job(job_id, w_id.as_str(), &db).await?; - if let Some(job) = job { - jobs.insert(job.id.to_string(), job); + let job = get_job_internal(&db, w_id.as_str(), job_id).await; + if let Ok(job) = job { + jobs.insert(job.id().to_string(), job); } } Ok(Json(jobs).into_response()) @@ -1562,6 +1562,13 @@ impl Job { Job::CompletedJob(job) => &job.job_kind, } } + + pub fn id(&self) -> Uuid { + match self { + Job::QueuedJob(job) => job.id, + Job::CompletedJob(job) => job.id, + } + } } #[derive(sqlx::FromRow)]