Make logs not fail in the daemon

dora-rs · May 2, 2023 · 7f82f32 · 7f82f32
1 parent 0854f91
commit 7f82f32
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/binaries/coordinator/src/lib.rs b/binaries/coordinator/src/lib.rs
@@ -704,12 +704,12 @@ async fn retrieve_logs(
     let reply_logs = match serde_json::from_slice(&reply_raw)
         .wrap_err("failed to deserialize logs reply from daemon")?
     {
-        DaemonCoordinatorReply::Logs { logs } => logs,
+        DaemonCoordinatorReply::Logs(logs) => logs,
         other => bail!("unexpected reply after sending reload: {other:?}"),
     };
     tracing::info!("successfully retrieved logs for `{dataflow_id}/{node_id}`");
 
-    Ok(reply_logs)
+    reply_logs.map_err(|err| eyre!(err))
 }
 
 async fn start_dataflow(

diff --git a/binaries/daemon/src/lib.rs b/binaries/daemon/src/lib.rs
@@ -326,9 +326,9 @@ impl Daemon {
                     Result::<Vec<u8>, eyre::Report>::Ok(contents)
                 }
                 .await
-                .expect("Could not retrieve logs");
+                .map_err(|err| format!("{err:?}"));
                 (
-                    Some(DaemonCoordinatorReply::Logs { logs }),
+                    Some(DaemonCoordinatorReply::Logs(logs)),
                     RunStatus::Continue,
                 )
             }

diff --git a/libraries/core/src/daemon_messages.rs b/libraries/core/src/daemon_messages.rs
@@ -239,7 +239,7 @@ pub enum DaemonCoordinatorReply {
     StopResult(Result<(), String>),
     DestroyResult(Result<(), String>),
     WatchdogAck,
-    Logs { logs: Vec<u8> },
+    Logs(Result<Vec<u8>, String>),
 }
 
 pub type DataflowId = Uuid;