From 0854f9149a0f757abbc7cbb3029c8d588dccd536 Mon Sep 17 00:00:00 2001
From: haixuanTao <tao.xavier@outlook.com>
Date: Tue, 2 May 2023 15:24:03 +0800
Subject: [PATCH] Make a centralised `log_path` function

---
 binaries/daemon/src/lib.rs   | 3 ++-
 binaries/daemon/src/log.rs   | 8 ++++++++
 binaries/daemon/src/spawn.rs | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 binaries/daemon/src/log.rs

diff --git a/binaries/daemon/src/lib.rs b/binaries/daemon/src/lib.rs
index ee8aca33..e79290fb 100644
--- a/binaries/daemon/src/lib.rs
+++ b/binaries/daemon/src/lib.rs
@@ -39,6 +39,7 @@ use uuid::Uuid;
 
 mod coordinator;
 mod inter_daemon;
+mod log;
 mod node_communication;
 mod spawn;
 mod tcp_utils;
@@ -314,7 +315,7 @@ impl Daemon {
                 let logs = async {
                     let log_dir = temp_dir();
 
-                    let mut file = File::open(log_dir.join(format!("{dataflow_id}-{node_id}.txt")))
+                    let mut file = File::open(log_dir.join(log::log_path(&dataflow_id, &node_id)))
                         .await
                         .wrap_err("Could not open log file")?;
 
diff --git a/binaries/daemon/src/log.rs b/binaries/daemon/src/log.rs
new file mode 100644
index 00000000..62119994
--- /dev/null
+++ b/binaries/daemon/src/log.rs
@@ -0,0 +1,8 @@
+use std::path::PathBuf;
+
+use dora_core::config::NodeId;
+use uuid::Uuid;
+
+pub fn log_path(dataflow_id: &Uuid, node_id: &NodeId) -> PathBuf {
+    PathBuf::from(format!("{dataflow_id}-{node_id}.txt"))
+}
diff --git a/binaries/daemon/src/spawn.rs b/binaries/daemon/src/spawn.rs
index a37361ac..fb510fff 100644
--- a/binaries/daemon/src/spawn.rs
+++ b/binaries/daemon/src/spawn.rs
@@ -1,5 +1,5 @@
 use crate::{
-    node_communication::spawn_listener_loop, node_inputs, runtime_node_inputs,
+    log, node_communication::spawn_listener_loop, node_inputs, runtime_node_inputs,
     runtime_node_outputs, DoraEvent, Event, NodeExitStatus,
 };
 use dora_core::{
@@ -181,7 +181,7 @@ pub async fn spawn_node(
 
     let (tx, mut rx) = mpsc::channel(10);
     let mut file = File::create(
-        &log_dir.join(PathBuf::from(format!("{dataflow_id}-{node_id}.txt")).with_extension("txt")),
+        &log_dir.join(PathBuf::from(log::log_path(&dataflow_id, &node_id)).with_extension("txt")),
     )
     .await
     .expect("Failed to create log file");