Browse Source

Update to log 0.3.0

Sam Clements 10 years ago
parent
commit
5b05b2a349
4 changed files with 20 additions and 16 deletions
  1. 1 1
      Cargo.toml
  2. 1 1
      README.md
  3. 17 13
      src/lib.rs
  4. 1 1
      tests/lib.rs

+ 1 - 1
Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "simple_logger"
-version = "0.1.1"
+version = "0.3.0"
 license = "MIT"
 authors = ["Sam Clements <sam@borntyping.co.uk>"]
 description = "A logger that prints all messages with a readable output format"

+ 1 - 1
README.md

@@ -19,7 +19,7 @@ extern crate log;
 extern crate simple_logger;
 
 fn main() {
-    simple_logger::init();
+    simple_logger::init().unwrap();
 
     warn!("This is an example message.");
 }

+ 17 - 13
src/lib.rs

@@ -3,27 +3,31 @@
 extern crate log;
 extern crate time;
 
+use log::{Log,LogLevel,LogLevelFilter,LogMetadata,LogRecord,SetLoggerError};
+
 struct SimpleLogger;
 
-impl log::Log for SimpleLogger {
-    fn enabled(&self, level: log::LogLevel, _module: &str) -> bool {
-        level <= log::LogLevel::Trace
+impl Log for SimpleLogger {
+    fn enabled(&self, metadata: &LogMetadata) -> bool {
+        metadata.level() <= LogLevel::Trace
     }
 
-    fn log(&self, record: &log::LogRecord) {
-        println!(
-            "{} {:<5} [{}] {}",
-            time::strftime("%Y-%m-%d %H:%M:%S", &time::now()).unwrap(),
-            record.level().to_string(),
-            record.location().module_path,
-            record.args());
+    fn log(&self, record: &LogRecord) {
+        if self.enabled(record.metadata()) {
+            println!(
+                "{} {:<5} [{}] {}",
+                time::strftime("%Y-%m-%d %H:%M:%S", &time::now()).unwrap(),
+                record.level().to_string(),
+                record.location().module_path(),
+                record.args());
+        }
     }
 }
 
 /// Initializes the global logger with a SimpleLogger instance
-pub fn init() {
+pub fn init() -> Result<(), SetLoggerError> {
     log::set_logger(|max_log_level| {
-        max_log_level.set(log::LogLevelFilter::Trace);
+        max_log_level.set(LogLevelFilter::Trace);
         return Box::new(SimpleLogger);
-    }).unwrap();
+    })
 }

+ 1 - 1
tests/lib.rs

@@ -4,6 +4,6 @@ extern crate simple_logger;
 
 #[test]
 fn log_message() {
-    simple_logger::init();
+    simple_logger::init().unwrap();
     warn!("This is an example message.");
 }