Update syncfile.rs

donnie4w · Dec 29, 2024 · a516577 · a516577
1 parent 08b2ebc
commit a516577
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/syncfile.rs b/src/syncfile.rs
@@ -97,6 +97,7 @@ impl FileHandler {
         match self.cutmode {
             CUTMODE::TIME => rename(&log_path, self.compress, self.max_backups, Some(getbackup_with_time(self.startsec, self.timemode))),
             CUTMODE::SIZE => rename(&log_path, self.compress, self.max_backups, None),
+            CUTMODE::MIXED=>rename(&log_path, self.compress, self.max_backups, Some(getbackup_with_time(self.startsec, self.timemode))),
         }
     }
 
@@ -117,6 +118,14 @@ impl FileHandler {
                     }
                 }
             }
+            CUTMODE::MIXED=> {
+                if passtimemode(self.startsec, self.timemode)|| self.max_size > 0 && self.filesize + data.len() as u64 > self.max_size{
+                    if let Ok(_) = self.rename() {
+                        let _ = self.new_from_clone();
+                        self.startsec = timesec();
+                    }
+                }
+            }
         }
         self.filehandle.write(data)?;
         self.filesize += data.len() as u64;