refactor: creates instead of delete

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

Author: seun-ja

crates/runtime-config/src/lib.rs

@@ -99,7 +99,6 @@ where
         local_app_dir: Option<PathBuf>,
         provided_state_dir: UserProvidedPath,
         provided_log_dir: UserProvidedPath,
-        refresh_logs: bool,
     ) -> anyhow::Result<Self> {
         let toml = match runtime_config_path {
             Some(runtime_config_path) => {
@@ -121,14 +120,13 @@ where
         let toml_resolver =
             TomlResolver::new(&toml, local_app_dir, provided_state_dir, provided_log_dir);
 
-        Self::new(toml_resolver, runtime_config_path, refresh_logs)
+        Self::new(toml_resolver, runtime_config_path)
     }
 
     /// Creates a new resolved runtime configuration from a TOML table.
     pub fn new(
         toml_resolver: TomlResolver<'_>,
         runtime_config_path: Option<&Path>,
-        refresh_logs: bool,
     ) -> anyhow::Result<Self> {
         let runtime_config_dir = runtime_config_path
             .and_then(Path::parent)
@@ -144,10 +142,6 @@ where
         let toml = toml_resolver.toml();
         let log_dir = toml_resolver.log_dir()?;
 
-        if refresh_logs {
-            let _ = Self::resolve_log_dir(&log_dir);
-        }
-
         let max_instance_memory = toml_resolver.max_instance_memory()?;
 
         let source = TomlRuntimeConfigSource::new(
@@ -173,14 +167,6 @@ where
         })
     }
 
-    fn resolve_log_dir(log_dir: &Option<PathBuf>) -> std::io::Result<()> {
-        if let Some(path) = log_dir {
-            std::fs::remove_dir_all(path)
-        } else {
-            Ok(())
-        }
-    }
-
     /// The fully resolved state directory.
     pub fn state_dir(&self) -> Option<PathBuf> {
         self.state_dir.clone()
@@ -508,7 +494,6 @@ mod tests {
                 ResolvedRuntimeConfig::<TestFactorsRuntimeConfig>::new(
                     toml_resolver(&toml),
                     Some(path.as_ref()),
-                    false,
                 )
             }
         };

crates/runtime-factors/src/build.rs

@@ -28,7 +28,6 @@ impl RuntimeFactorsBuilder for FactorsBuilder {
             config.local_app_dir.clone().map(PathBuf::from),
             config.state_dir.clone(),
             config.log_dir.clone(),
-            config.refresh_logs,
         )?;
 
         runtime_config.summarize(config.runtime_config_file.as_deref());
@@ -51,6 +50,7 @@ impl RuntimeFactorsBuilder for FactorsBuilder {
         executor.add_hooks(StdioLoggingExecutorHooks::new(
             config.follow_components.clone(),
             runtime_config.log_dir(),
+            config.refresh_logs,
         ));
         executor.add_hooks(SqlStatementExecutorHook::new(
             args.sqlite_statements.clone(),

crates/trigger/src/cli.rs

@@ -147,7 +147,7 @@ pub struct FactorsConfig {
     pub follow_components: FollowComponents,
     /// Log directory for component stdout/stderr.
     pub log_dir: UserProvidedPath,
-    /// Whether to refresh logs when restarted.
+    /// If set, Spin deletes the log files before starting the application.
     pub refresh_logs: bool,
 }
 

crates/trigger/src/cli/stdio.rs

@@ -12,6 +12,9 @@ use spin_factors::RuntimeFactors;
 use spin_factors_executor::ExecutorHooks;
 use tokio::io::AsyncWrite;
 
+pub const STDOUT_LOG_FILE_SUFFIX: &str = "stdout";
+pub const STDERR_LOG_FILE_SUFFIX: &str = "stderr";
+
 /// Which components should have their logs followed on stdout/stderr.
 #[derive(Clone, Debug, Default)]
 pub enum FollowComponents {
@@ -39,13 +42,19 @@ impl FollowComponents {
 pub struct StdioLoggingExecutorHooks {
     follow_components: FollowComponents,
     log_dir: Option<PathBuf>,
+    refresh_log: bool,
 }
 
 impl StdioLoggingExecutorHooks {
-    pub fn new(follow_components: FollowComponents, log_dir: Option<PathBuf>) -> Self {
+    pub fn new(
+        follow_components: FollowComponents,
+        log_dir: Option<PathBuf>,
+        refresh_log: bool,
+    ) -> Self {
         Self {
             follow_components,
             log_dir,
+            refresh_log,
         }
     }
 
@@ -56,8 +65,7 @@ impl StdioLoggingExecutorHooks {
         log_dir: Option<&Path>,
     ) -> Result<ComponentStdioWriter> {
         let sanitized_component_id = sanitize_filename::sanitize(component_id);
-        let log_path = log_dir
-            .map(|log_dir| log_dir.join(format!("{sanitized_component_id}_{log_suffix}.txt",)));
+        let log_path = santized_log_path(log_dir, &sanitized_component_id, log_suffix);
         let log_path = log_path.as_deref();
 
         let follow = self.follow_components.should_follow(component_id);
@@ -95,6 +103,33 @@ impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for StdioLoggingExecutorHooks {
         configured_app: &spin_factors::ConfiguredApp<F>,
     ) -> anyhow::Result<()> {
         self.validate_follows(configured_app.app())?;
+
+        if self.refresh_log {
+            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) = santized_log_path(
+                    self.log_dir.as_deref(),
+                    &sanitized_component_id,
+                    STDOUT_LOG_FILE_SUFFIX,
+                ) {
+                    let _ = std::fs::File::create(stdout_log_path);
+                }
+
+                if let Some(stderr_log_path) = santized_log_path(
+                    self.log_dir.as_deref(),
+                    &sanitized_component_id,
+                    STDERR_LOG_FILE_SUFFIX,
+                ) {
+                    let _ = std::fs::File::create(stderr_log_path);
+                }
+            }
+        }
+
         if let Some(dir) = &self.log_dir {
             // Ensure log dir exists if set
             std::fs::create_dir_all(dir)
@@ -115,12 +150,12 @@ impl<F: RuntimeFactors, U> ExecutorHooks<F, U> for StdioLoggingExecutorHooks {
         };
         wasi_builder.stdout_pipe(self.component_stdio_writer(
             &component_id,
-            "stdout",
+            STDOUT_LOG_FILE_SUFFIX,
             self.log_dir.as_deref(),
         )?);
         wasi_builder.stderr_pipe(self.component_stdio_writer(
             &component_id,
-            "stderr",
+            STDERR_LOG_FILE_SUFFIX,
             self.log_dir.as_deref(),
         )?);
         Ok(())
@@ -328,3 +363,11 @@ fn bullet_list<S: std::fmt::Display>(items: impl IntoIterator<Item = S>) -> Stri
         .collect::<Vec<_>>()
         .join("\n")
 }
+
+fn santized_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",)))
+}