add impl split

rbatis · Jul 26, 2024 · 046ebd0 · 046ebd0
1 parent 10e7a04
commit 046ebd0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 19 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -110,10 +110,10 @@ impl Config {
         how:H
     ) -> Self {
         self.appends.push(Mutex::new(Box::new(
-            FileSplitAppender::new::<RawFile,R,H>(
+            FileSplitAppender::new::<RawFile>(
                 file_path,
-                how,
-                rolling_type,
+                Box::new(how),
+                Box::new(rolling_type),
                 Box::new(packer),
             )
             .unwrap(),
@@ -150,7 +150,7 @@ impl Config {
         how_pack:H,
     ) -> Self {
         self.appends.push(Mutex::new(Box::new(
-            FileSplitAppender::new::<F,R,H>(file_path,how_pack, keeper, Box::new(packer)).unwrap(),
+            FileSplitAppender::new::<F>(file_path, Box::new(how_pack), Box::new(keeper), Box::new(packer)).unwrap(),
         )));
         self
     }

diff --git a/src/plugin/file_loop.rs b/src/plugin/file_loop.rs
@@ -12,10 +12,10 @@ pub struct FileLoopAppender {
 impl FileLoopAppender {
     pub fn new(log_file_path: &str, size: LogSize) -> Result<FileLoopAppender, LogError> {
         Ok(Self {
-            file: FileSplitAppender::new::<RawFile,KeepType,HowToPackType>(
+            file: FileSplitAppender::new::<RawFile>(
                 log_file_path,
-                HowToPackType::BySize(size),
-                KeepType::KeepNum(1),
+                Box::new(HowToPackType::BySize(size)),
+                Box::new(KeepType::KeepNum(1)),
                 Box::new(LogPacker {}),
             )?,
         })

diff --git a/src/plugin/file_split.rs b/src/plugin/file_split.rs
@@ -214,12 +214,10 @@ pub struct FileSplitAppender {
 }
 
 impl FileSplitAppender {
-    pub fn new<F: SplitFile + 'static,
-        R: Keep + 'static,
-        H: HowToPack + 'static>(
+    pub fn new<F: SplitFile + 'static>(
         file_path: &str,
-        how_to_pack: H,
-        rolling_type: R,
+        how_to_pack: Box<dyn HowToPack>,
+        rolling_type: Box<dyn Keep>,
         packer: Box<dyn Packer>,
     ) -> Result<FileSplitAppender, LogError> {
         let temp_name = {
@@ -262,7 +260,7 @@ impl FileSplitAppender {
             dir_path: dir_path.to_string(),
             file: Box::new(file) as Box<dyn SplitFile>,
             sender,
-            how_to_pack: Box::new(how_to_pack),
+            how_to_pack: how_to_pack,
             temp_name,
             packer: arc_packer,
         })
@@ -456,10 +454,10 @@ impl LogAppender for FileSplitAppender {
 }
 
 ///spawn an saver thread to save log file or zip file
-fn spawn_saver<R: Keep + 'static>(
+fn spawn_saver(
     temp_name: String,
     r: Receiver<LogPack>,
-    rolling_type: R,
+    rolling_type: Box<dyn Keep>,
     packer: Arc<Box<dyn Packer>>,
 ) {
     std::thread::spawn(move || {

diff --git a/tests/split_test.rs b/tests/split_test.rs
@@ -3,7 +3,7 @@ mod test {
     use fast_log::appender::{Command, FastLogRecord, LogAppender};
     use fast_log::consts::LogSize;
     use fast_log::plugin::file_name::FileName;
-    use fast_log::plugin::file_split::{FileSplitAppender, HowToPackType, Keep, Packer, RawFile, RollingType, SplitFile};
+    use fast_log::plugin::file_split::{FileSplitAppender, HowToPackType, Keep, Packer, RawFile, RollingType};
     use fast_log::plugin::packer::LogPacker;
     use fastdate::DateTime;
     use log::Level;
@@ -14,10 +14,10 @@ mod test {
     #[test]
     fn test_send_pack() {
         let _ = remove_dir_all("target/test/");
-        let mut appender = FileSplitAppender::new::<RawFile, RollingType, HowToPackType>(
+        let mut appender = FileSplitAppender::new::<RawFile>(
             "target/test/",
-            HowToPackType::BySize(LogSize::MB(1)),
-            RollingType::All,
+            Box::new(HowToPackType::BySize(LogSize::MB(1))),
+            Box::new(RollingType::All),
             Box::new(LogPacker {}),
         )
             .unwrap();