refactor: renaming + login

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

Author: seun-ja

crates/runtime-config/src/lib.rs

@@ -118,21 +118,17 @@ where
             }
             None => Default::default(),
         };
-        let toml_resolver = TomlResolver::new(
-            &toml,
-            local_app_dir,
-            provided_state_dir,
-            provided_log_dir,
-            refresh_logs,
-        );
+        let toml_resolver =
+            TomlResolver::new(&toml, local_app_dir, provided_state_dir, provided_log_dir);
 
-        Self::new(toml_resolver, runtime_config_path)
+        Self::new(toml_resolver, runtime_config_path, refresh_logs)
     }
 
     /// 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)
@@ -147,6 +143,11 @@ 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(
@@ -172,6 +173,14 @@ 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()
@@ -198,8 +207,6 @@ pub struct TomlResolver<'a> {
     state_dir: UserProvidedPath,
     /// Explicitly provided log directory.
     log_dir: UserProvidedPath,
-    /// Whether to refresh logs when restarted.
-    refresh_logs: bool,
 }
 
 impl<'a> TomlResolver<'a> {
@@ -209,14 +216,12 @@ impl<'a> TomlResolver<'a> {
         local_app_dir: Option<PathBuf>,
         state_dir: UserProvidedPath,
         log_dir: UserProvidedPath,
-        refresh_logs: bool,
     ) -> Self {
         Self {
             table: TomlKeyTracker::new(table),
             local_app_dir,
             state_dir,
             log_dir,
-            refresh_logs,
         }
     }
 
@@ -278,17 +283,7 @@ impl<'a> TomlResolver<'a> {
         }
 
         match log_dir {
-            UserProvidedPath::Provided(p) if self.refresh_logs => Ok(Some({
-                let _ = std::fs::remove_dir_all(&p);
-
-                std::path::absolute(p)?
-            })),
             UserProvidedPath::Provided(p) => Ok(Some(std::path::absolute(p)?)),
-            UserProvidedPath::Default if self.refresh_logs => Ok(self.state_dir()?.map(|p| {
-                let _ = std::fs::remove_dir_all(&p);
-
-                p.join("logs")
-            })),
             UserProvidedPath::Default => Ok(self.state_dir()?.map(|p| p.join("logs"))),
             UserProvidedPath::Unset => Ok(None),
         }
@@ -513,6 +508,7 @@ mod tests {
                 ResolvedRuntimeConfig::<TestFactorsRuntimeConfig>::new(
                     toml_resolver(&toml),
                     Some(path.as_ref()),
+                    false,
                 )
             }
         };
@@ -639,7 +635,6 @@ mod tests {
             None,
             UserProvidedPath::Default,
             UserProvidedPath::Default,
-            false,
         )
     }
 

crates/trigger/src/cli.rs

@@ -27,7 +27,7 @@ pub use stdio::StdioLoggingExecutorHooks;
 pub use summary::{KeyValueDefaultStoreSummaryHook, SqliteDefaultStoreSummaryHook};
 
 pub const APP_LOG_DIR: &str = "APP_LOG_DIR";
-pub const REFRESH_LOGS: &str = "REFRESH_LOGS";
+pub const SPIN_REFRESH_LOGS: &str = "SPIN_REFRESH_LOGS";
 pub const DISABLE_WASMTIME_CACHE: &str = "DISABLE_WASMTIME_CACHE";
 pub const FOLLOW_LOG_OPT: &str = "FOLLOW_ID";
 pub const WASMTIME_CACHE_FILE: &str = "WASMTIME_CACHE_FILE";
@@ -55,10 +55,9 @@ pub struct FactorsTriggerCommand<T: Trigger<B::Factors>, B: RuntimeFactorsBuilde
     )]
     pub log: Option<PathBuf>,
 
-    /// Whether to refresh logs when restarted.
+    /// If set, Spin deletes the log files before starting the application.
     #[clap(
-        name = REFRESH_LOGS,
-        short = 'r',
+        name = SPIN_REFRESH_LOGS,
         long = "refresh-logs",
     )]
     pub refresh_logs: bool,