change detail

rbatis · Dec 28, 2023 · c6bea1d · c6bea1d
1 parent fec4df2
commit c6bea1d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ members = [
 
 [package]
 name = "fast_log"
-version = "1.6.10"
+version = "1.6.11"
 description = "Rust async log High-performance asynchronous logging"
 readme = "Readme.md"
 authors = ["ce <zhuxiujia@qq.com>"]

diff --git a/example/src/bench_test_file_split.rs b/example/src/bench_test_file_split.rs
@@ -11,12 +11,7 @@ fn main() {
     let _ = std::fs::remove_dir("target/logs/");
     fast_log::init(
         Config::new()
-            .file_split(
-                "target/logs/",
-                LogSize::MB(1),
-                KeepType::All,
-                LogPacker {},
-            )
+            .file_split("target/logs/", LogSize::MB(1), KeepType::All, LogPacker {})
             .chan_len(Some(100000)),
     )
     .unwrap();

diff --git a/example/src/custom_appender.rs b/example/src/custom_appender.rs
@@ -1,6 +1,6 @@
-use fastdate::DateTime;
 use fast_log::appender::{FastLogRecord, LogAppender};
 use fast_log::config::Config;
+use fastdate::DateTime;
 use log::Level;
 
 struct CustomLog {}

diff --git a/example/src/custom_appender_tokio.rs b/example/src/custom_appender_tokio.rs
@@ -1,6 +1,6 @@
-use fastdate::DateTime;
 use fast_log::appender::{FastLogRecord, LogAppender};
 use fast_log::config::Config;
+use fastdate::DateTime;
 use log::Level;
 use tokio::runtime::Runtime;
 

diff --git a/example/src/main.rs b/example/src/main.rs
@@ -6,5 +6,6 @@ fn main() {
         log::info!("Commencing yak shaving{}", 0);
     }
     fast_log::print("Commencing print\n".into()).expect("fast log not init");
+    log::error!("Commencing yak shaving{}", 0);
     log::logger().flush();
 }
diff --git a/example/src/split_log_mmap.rs b/example/src/split_log_mmap.rs
@@ -16,7 +16,7 @@ fn main() {
                 LogPacker {},
             ),
     )
-        .unwrap();
+    .unwrap();
     for _ in 0..40000 {
         log::info!("Commencing yak shaving");
     }

diff --git a/src/formats.rs b/src/formats.rs
@@ -39,10 +39,7 @@ impl RecordFormat for FastLogFormat {
                         arg.args,
                     );
                 } else {
-                    arg.formated = format!(
-                        "{:27} {} {} - {}\n",
-                        &now, arg.level, arg.module_path, arg.args
-                    );
+                    arg.formated = format!("{:27} {} - {}\n", &now, arg.level, arg.args);
                 }
             }
             Command::CommandExit => {}
@@ -64,6 +61,12 @@ impl FastLogFormat {
         self.display_line_level = level;
         self
     }
+
+    /// set time_type
+    pub fn set_time_type(mut self, time_type: TimeType) -> Self {
+        self.time_type = time_type;
+        self
+    }
 }
 
 pub struct FastLogFormatJson {

diff --git a/src/plugin/packer.rs b/src/plugin/packer.rs
@@ -50,10 +50,11 @@ impl Packer for ZipPacker {
         let zip_file = zip_file.unwrap();
         //write zip bytes data
         let mut zip = zip::ZipWriter::new(zip_file);
-        zip.start_file(log_name, FileOptions::default()).map_err(|e|LogError::from(e.to_string()))?;
+        zip.start_file(log_name, FileOptions::default())
+            .map_err(|e| LogError::from(e.to_string()))?;
         //buf reader
-        std::io::copy(&mut log_file, &mut zip).map_err(|e|LogError::from(e.to_string()))?;
-        zip.flush().map_err(|e|LogError::from(e.to_string()))?;
+        std::io::copy(&mut log_file, &mut zip).map_err(|e| LogError::from(e.to_string()))?;
+        zip.flush().map_err(|e| LogError::from(e.to_string()))?;
         let finish: ZipResult<File> = zip.finish();
         if finish.is_err() {
             //println!("[fast_log] try zip fail{:?}", finish.err());
@@ -94,7 +95,7 @@ impl Packer for LZ4Packer {
         //write lz4 bytes data
         let mut encoder = FrameEncoder::new(lz4_file);
         //buf reader
-        std::io::copy(&mut log_file, &mut encoder).map_err(|e|LogError::from(e.to_string()))?;
+        std::io::copy(&mut log_file, &mut encoder).map_err(|e| LogError::from(e.to_string()))?;
         let result = encoder.finish();
         if result.is_err() {
             return Err(LogError::from(format!(
@@ -134,8 +135,8 @@ impl Packer for GZipPacker {
         let zip_file = zip_file.unwrap();
         //write zip bytes data
         let mut zip = GzEncoder::new(zip_file, Compression::default());
-        std::io::copy(&mut log_file, &mut zip).map_err(|e|LogError::from(e.to_string()))?;
-        zip.flush().map_err(|e|LogError::from(e.to_string()))?;
+        std::io::copy(&mut log_file, &mut zip).map_err(|e| LogError::from(e.to_string()))?;
+        zip.flush().map_err(|e| LogError::from(e.to_string()))?;
         let finish = zip.finish();
         if finish.is_err() {
             return Err(LogError::from(format!(