Simplify log file backup creation

Perform a single operation to rename old log file into the backup log
file and to overwrite any existing backup.

1 files changed, 9 insertions, 21 deletions

diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 37f36b7a6c..f4a033e5f0 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -656,34 +656,22 @@ impl Daemon {
 
     fn prepare_tunnel_log_file(&self) -> Result<()> {
         if let Some(ref file) = self.tunnel_log {
-            if file.exists() {
-                Self::backup_existing_tunnel_log_file(file);
-            }
+            let mut backup = file.clone();
+            backup.set_extension("old.log");
+
+            fs::rename(file, backup).unwrap_or_else(|error| {
+                warn!(
+                    "Failed to create backup of previous tunnel log file ({})",
+                    error
+                );
+            });
 
-            let _ = fs::remove_file(file);
             fs::File::create(file).chain_err(|| "Unable to create the tunnel log file")?;
         }
 
         Ok(())
     }
 
-    fn backup_existing_tunnel_log_file(log_file: &PathBuf) {
-        let mut backup = log_file.clone();
-        backup.set_extension("old.log");
-
-        // Try to remove file first, in case rename fails to overwrite it
-        fs::remove_file(&backup).unwrap_or_else(|error| {
-            warn!("Failed to remove old backup of tunnel log file ({})", error);
-        });
-
-        fs::rename(log_file, backup).unwrap_or_else(|error| {
-            warn!(
-                "Failed to create backup of previous tunnel log file ({})",
-                error
-            );
-        });
-    }
-
     fn spawn_tunnel_monitor(
         &self,
         tunnel_endpoint: TunnelEndpoint,