From ed35332ebadabdfb46958b784f261511c4e114de Mon Sep 17 00:00:00 2001 From: Hennzau Date: Tue, 10 Sep 2024 09:34:40 +0200 Subject: [PATCH] fix issue --- binaries/coordinator/src/lib.rs | 35 ++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/binaries/coordinator/src/lib.rs b/binaries/coordinator/src/lib.rs index 5f89f8e1..0184f777 100644 --- a/binaries/coordinator/src/lib.rs +++ b/binaries/coordinator/src/lib.rs @@ -425,24 +425,31 @@ async fn start_inner( }, ControlRequest::Logs { uuid, name, node } => { let dataflow_uuid = if let Some(uuid) = uuid { - uuid + Ok(uuid) } else if let Some(name) = name { - resolve_name(name, &running_dataflows, &archived_dataflows)? + resolve_name(name, &running_dataflows, &archived_dataflows) } else { - bail!("No uuid") + Err(eyre!("No uuid")) }; - let reply = retrieve_logs( - &running_dataflows, - &archived_dataflows, - dataflow_uuid, - node.into(), - &mut daemon_connections, - clock.new_timestamp(), - ) - .await - .map(ControlRequestReply::Logs); - let _ = reply_sender.send(reply); + match dataflow_uuid { + Ok(uuid) => { + let reply = retrieve_logs( + &running_dataflows, + &archived_dataflows, + uuid, + node.into(), + &mut daemon_connections, + clock.new_timestamp(), + ) + .await + .map(ControlRequestReply::Logs); + let _ = reply_sender.send(reply); + } + Err(err) => { + let _ = reply_sender.send(Err(err)); + } + } } ControlRequest::Destroy => { tracing::info!("Received destroy command");