handled file creation without duplicates

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

Author: seun-ja

crates/trigger/src/cli/stdio.rs

@@ -65,7 +65,8 @@ impl StdioLoggingExecutorHooks {
         log_dir: Option<&Path>,
     ) -> Result<ComponentStdioWriter> {
         let sanitized_component_id = sanitize_filename::sanitize(component_id);
-        let log_path = sanitized_log_path(log_dir, &sanitized_component_id, log_suffix);
+        let log_path = log_dir
+            .map(|log_dir| log_dir.join(format!("{sanitized_component_id}_{log_suffix}.txt",)));
         let log_path = log_path.as_deref();
 
         let follow = self.follow_components.should_follow(component_id);
@@ -95,31 +96,20 @@ impl StdioLoggingExecutorHooks {
         }
     }
 
-    fn truncate_log_files<F: RuntimeFactors>(
-        &self,
-        configured_app: &spin_factors::ConfiguredApp<F>,
-    ) {
-        let sanitized_component_ids: Vec<String> = configured_app
-            .app()
-            .components()
-            .map(|c| sanitize_filename::sanitize(c.locked.id.clone()))
-            .collect();
-
-        for sanitized_component_id in sanitized_component_ids {
-            if let Some(stdout_log_path) = sanitized_log_path(
-                self.log_dir.as_deref(),
-                &sanitized_component_id,
-                STDOUT_LOG_FILE_SUFFIX,
-            ) {
-                _ = std::fs::File::create(stdout_log_path);
-            }
-
-            if let Some(stderr_log_path) = sanitized_log_path(
-                self.log_dir.as_deref(),
-                &sanitized_component_id,
-                STDERR_LOG_FILE_SUFFIX,
-            ) {
-                _ = std::fs::File::create(stderr_log_path);
+    fn truncate_log_files(&self, log_dir: &Option<PathBuf>) {
+        let Some(dir) = log_dir else { return };
+        if let Ok(entries) = dir.read_dir() {
+            for entry in entries.flatten() {
+                let path = entry.path();
+                let Some(name) = path.file_name().and_then(|n| n.to_str()) else {
+                    continue;
+                };
+
+                if name.ends_with(&format!("{STDOUT_LOG_FILE_SUFFIX}.txt"))
+                    || name.ends_with(&format!("{STDERR_LOG_FILE_SUFFIX}.txt"))
+                {
+                    let _ = std::fs::File::create(dir.join(name));
+                }
             }
         }
     }
@@ -139,7 +129,7 @@ impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for StdioLoggingExecutorHooks {
                 .with_context(|| format!("Failed to create log dir {}", quoted_path(dir)))?;
 
             if self.truncate_log {
-                self.truncate_log_files(configured_app);
+                self.truncate_log_files(&self.log_dir);
             }
 
             println!("Logging component stdio to {}", quoted_path(dir.join("")))
@@ -370,11 +360,3 @@ fn bullet_list<S: std::fmt::Display>(items: impl IntoIterator<Item = S>) -> Stri
         .collect::<Vec<_>>()
         .join("\n")
 }
-
-fn sanitized_log_path(
-    log_dir: Option<&Path>,
-    sanitized_component_id: &str,
-    log_suffix: &str,
-) -> Option<PathBuf> {
-    log_dir.map(|log_dir| log_dir.join(format!("{sanitized_component_id}_{log_suffix}.txt",)))
-}