From 5f76ea33211d9931aed0ae94cf95476dbb969083 Mon Sep 17 00:00:00 2001
From: haixuanTao <tao.xavier@outlook.com>
Date: Fri, 22 Nov 2024 10:40:13 +0100
Subject: [PATCH] Add an error when a node fails when using dora run by
 printing send_log_message

---
 binaries/daemon/src/lib.rs | 42 +++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/binaries/daemon/src/lib.rs b/binaries/daemon/src/lib.rs
index b635d758..db62a2d9 100644
--- a/binaries/daemon/src/lib.rs
+++ b/binaries/daemon/src/lib.rs
@@ -358,11 +358,40 @@ impl Daemon {
             })?;
             socket_stream_send(connection, &msg)
                 .await
-                .wrap_err("failed to send watchdog message to dora-coordinator")?;
+                .wrap_err("failed to send log message to dora-coordinator")?;
 
             if self.last_coordinator_heartbeat.elapsed() > Duration::from_secs(20) {
                 bail!("lost connection to coordinator")
             }
+        } else {
+            match message.level {
+                LogLevel::Error => {
+                    if let Some(node_id) = message.node_id {
+                        tracing::error!("{}/{} errored:", message.dataflow_id.to_string(), node_id);
+                    }
+                    for line in message.message.lines() {
+                        tracing::error!("   {}", line);
+                    }
+                }
+                LogLevel::Warn => {
+                    if let Some(node_id) = message.node_id {
+                        tracing::warn!("{}/{} warned:", message.dataflow_id.to_string(), node_id);
+                    }
+                    for line in message.message.lines() {
+                        tracing::warn!("    {}", line);
+                    }
+                }
+                LogLevel::Info => {
+                    if let Some(node_id) = message.node_id {
+                        tracing::info!("{}/{} info:", message.dataflow_id.to_string(), node_id);
+                    }
+
+                    for line in message.message.lines() {
+                        tracing::info!("    {}", line);
+                    }
+                }
+                _ => {}
+            }
         }
         Ok(())
     }
@@ -1237,10 +1266,7 @@ impl Daemon {
                 exit_status,
             } => {
                 let node_result = match exit_status {
-                    NodeExitStatus::Success => {
-                        tracing::info!("node {dataflow_id}/{node_id} finished successfully");
-                        Ok(())
-                    }
+                    NodeExitStatus::Success => Ok(()),
                     exit_status => {
                         let dataflow = self.running.get(&dataflow_id);
                         let caused_by_node = dataflow
@@ -1274,10 +1300,6 @@ impl Daemon {
                                     })
                                     .unwrap_or_default();
 
-                                tracing::error!("node {dataflow_id}/{node_id} failed with:");
-                                for line in cause.lines() {
-                                    tracing::error!("    {}", line);
-                                }
                                 NodeErrorCause::Other { stderr: cause }
                             }
                         };
@@ -1302,7 +1324,7 @@ impl Daemon {
                     file: None,
                     line: None,
                     message: match &node_result {
-                        Ok(()) => "node finished successfully".to_string(),
+                        Ok(()) => format!("{node_id} finished successfully"),
                         Err(err) => format!("{err}"),
                     },
                 })