Merge pull request #129 from qarmin/master

Add posibility to print module

src/config.rs

@@ -79,6 +79,7 @@ pub struct Config {
     pub(crate) target: LevelFilter,
     pub(crate) target_padding: TargetPadding,
     pub(crate) location: LevelFilter,
+    pub(crate) module: LevelFilter,
     pub(crate) time_format: TimeFormat,
     pub(crate) time_offset: UtcOffset,
     pub(crate) filter_allow: Cow<'static, [Cow<'static, str>]>,
@@ -149,6 +150,12 @@ impl ConfigBuilder {
         self
     }
 
+    /// Set at which level and above (more verbose) a module shall be logged (default is Off)
+    pub fn set_module_level(&mut self, module: LevelFilter) -> &mut ConfigBuilder {
+        self.0.module = module;
+        self
+    }
+
     /// Set how the levels should be padded, when logging (default is Off)
     pub fn set_level_padding(&mut self, padding: LevelPadding) -> &mut ConfigBuilder {
         self.0.level_padding = padding;
@@ -335,6 +342,7 @@ impl Default for Config {
             target: LevelFilter::Debug,
             target_padding: TargetPadding::Off,
             location: LevelFilter::Trace,
+            module: LevelFilter::Off,
             time_format: TimeFormat::Custom(format_description!("[hour]:[minute]:[second]")),
             time_offset: UtcOffset::UTC,
             filter_allow: Cow::Borrowed(&[]),

src/loggers/logging.rs

@@ -57,6 +57,10 @@ where
         write_location(record, write)?;
     }
 
+    if config.module <= record.level() && config.module != LevelFilter::Off {
+        write_module(record, write)?;
+    }
+
     #[cfg(feature = "paris")]
     return write_args(record, write, config.enable_paris_formatting);
     #[cfg(not(feature = "paris"))]
@@ -167,6 +171,16 @@ where
     Ok(())
 }
 
+#[inline(always)]
+pub fn write_module<W>(record: &Record<'_>, write: &mut W) -> Result<(), Error>
+where
+    W: Write + Sized,
+{
+    let module = record.module_path().unwrap_or("<unknown>");
+    write!(write, "[{}] ", module)?;
+    Ok(())
+}
+
 pub fn write_thread_name<W>(write: &mut W, config: &Config) -> Result<(), Error>
 where
     W: Write + Sized,

src/loggers/termlog.rs

@@ -171,6 +171,10 @@ impl TermLogger {
             write_location(record, term_lock)?;
         }
 
+        if self.config.module <= record.level() && self.config.module != LevelFilter::Off {
+            write_module(record, term_lock)?;
+        }
+
         #[cfg(feature = "paris")]
         write_args(record, term_lock, self.config.enable_paris_formatting)?;
         #[cfg(not(feature = "paris"))]

src/loggers/testlog.rs

@@ -124,6 +124,10 @@ pub fn log(config: &Config, record: &Record<'_>) {
         write_location(record);
     }
 
+    if config.module <= record.level() && config.module != LevelFilter::Off {
+        write_module(record);
+    }
+
     write_args(record);
 }
 
@@ -175,6 +179,12 @@ pub fn write_location(record: &Record<'_>) {
     }
 }
 
+#[inline(always)]
+pub fn write_module(record: &Record<'_>) {
+    let module = record.module_path().unwrap_or("<unknown>");
+    print!("[{}] ", module);
+}
+
 #[inline(always)]
 pub fn write_args(record: &Record<'_>) {
     println!("{}", record.args());