try harder to back up temp file

ctc-oss · Dec 19, 2023 · 148bb1a · 148bb1a
1 parent c0cce6f
commit 148bb1a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/crates/daemon/src/profiler.rs b/crates/daemon/src/profiler.rs
@@ -70,7 +70,12 @@ impl Profiler {
                 // create a temp file as the backup location
                 let backup = NamedTempFile::new()?;
                 // move original compiled to backup location
-                fs::rename(&compiled, &backup)?;
+                fs::rename(&compiled, &backup).or_else(|x| {
+                    log::debug!("rename fallback copy");
+                    fs::copy(&compiled, &backup)
+                        .and_then(|_| fs::remove_file(&compiled))
+                        .or(Err(x))
+                })?;
                 // write compiled rules for the profiling run
                 write::compiled_rules(db, &compiled)?;
                 log::debug!("rules backed up to {:?}", backup.path());

diff --git a/crates/tools/Cargo.toml b/crates/tools/Cargo.toml
@@ -5,6 +5,10 @@ license = "GPL-3.0-or-later"
 version = "0.5.0"
 edition = "2021"
 
+[[bin]]
+name = "rr"
+path = "src/rule_reloader.rs"
+
 [[bin]]
 name = "tdb"
 path = "src/trust_db_util.rs"