From ed45c7f3ea98db77200b23c7449a75b7f37f7bb3 Mon Sep 17 00:00:00 2001
From: zxj <zhuxiujia@qq.com>
Date: Mon, 29 Jul 2024 17:35:12 +0800
Subject: [PATCH] add impl PackType

---
 src/plugin/file_split.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/plugin/file_split.rs b/src/plugin/file_split.rs
index 6a12c91..deb0b01 100644
--- a/src/plugin/file_split.rs
+++ b/src/plugin/file_split.rs
@@ -56,7 +56,7 @@ pub trait Packer: Send + Sync {
 
 /// is can do pack?
 pub trait CanPack: Send {
-    fn is(&mut self, temp_size: usize, arg: &FastLogRecord) -> bool;
+    fn is(&mut self, temp_size: usize, arg: &FastLogRecord) -> Option<DateTime>;
 }
 
 /// keep logs, for example keep by log num or keep by log create time.
@@ -178,22 +178,23 @@ pub enum PackType {
 }
 
 impl CanPack for PackType {
-    fn is(&mut self, temp_size: usize, arg: &FastLogRecord) -> bool {
+    fn is(&mut self, temp_size: usize, arg: &FastLogRecord) -> Option<DateTime> {
         return match self {
             PackType::ByDate(date_time) => {
                 let dt = fastdate::DateTime::from_system_time(arg.now, fastdate::offset_sec());
                 if dt.day() > date_time.day() {
+                    let last_time = date_time.clone();
                     *date_time = dt;
-                    true
+                    Some(last_time)
                 } else {
-                    false
+                    None
                 }
             }
             PackType::BySize(limit) => {
                 if temp_size >= limit.get_len() {
-                    true
+                    Some(DateTime::now())
                 } else {
-                    false
+                    None
                 }
             }
         };
@@ -266,13 +267,12 @@ impl FileSplitAppender {
         })
     }
     /// send data make an pack,and truncate data when finish.
-    pub fn send_pack(&self, time: SystemTime, wg: Option<WaitGroup>) {
+    pub fn send_pack(&self, date: DateTime, wg: Option<WaitGroup>) {
         let mut sp = "";
         if !self.dir_path.is_empty() && !self.dir_path.ends_with("/") {
             sp = "/";
         }
         let first_file_path = format!("{}{}{}", self.dir_path, sp, &self.temp_name);
-        let date = DateTime::from_system_time(time, fastdate::offset_sec());
         let new_log_name = self
             .packer
             .new_data_log_name(&first_file_path, date);
@@ -400,7 +400,7 @@ impl LogAppender for FileSplitAppender {
                     let current_temp_size = self.temp_bytes.load(Ordering::Relaxed)
                         + temp.as_bytes().len()
                         + x.formated.as_bytes().len();
-                    if self.is_pack.is(current_temp_size, x) {
+                    if let Some(pack_time) = self.is_pack.is(current_temp_size, x) {
                         self.temp_bytes.fetch_add(
                             {
                                 let w = self.file.write(temp.as_bytes());
@@ -413,14 +413,14 @@ impl LogAppender for FileSplitAppender {
                             Ordering::SeqCst,
                         );
                         temp.clear();
-                        self.send_pack(x.now, None);
+                        self.send_pack(pack_time, None);
                     }
                     temp.push_str(x.formated.as_str());
                 }
                 Command::CommandExit => {}
                 Command::CommandFlush(ref w) => {
                     let current_temp_size = self.temp_bytes.load(Ordering::Relaxed);
-                    if self.is_pack.is(current_temp_size, x) {
+                    if let Some(pack_time) = self.is_pack.is(current_temp_size, x) {
                         self.temp_bytes.fetch_add(
                             {
                                 let w = self.file.write(temp.as_bytes());
@@ -433,7 +433,7 @@ impl LogAppender for FileSplitAppender {
                             Ordering::SeqCst,
                         );
                         temp.clear();
-                        self.send_pack(x.now, Some(w.clone()));
+                        self.send_pack(pack_time, Some(w.clone()));
                     }
                 }
             }