Port to slog v2

Author: dpc

.gitignore

@@ -1,2 +1,5 @@
-target/
-Cargo.lock
+/target
+/Cargo.lock
+/tags
+/.cargo
+/rusty-tags.vi

CHANGELOG.md

@@ -0,0 +1,11 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/)
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+
+## 2.0.0-1.0 - 2017-03-05
+### Changed
+
+* Ported to slog v2

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "slog-envlogger"
-version = "0.5.0"
+version = "2.0.0-1.0"
 authors = ["The Rust Project Developers", "Dawid Ciężarkiewicz <dpc@dpc.pw>"]
 license = "MIT/Apache-2.0"
 readme = "README.md"
@@ -16,10 +16,12 @@ Port of de facto standard logger implementation for Rust, to `slog-rs` framework
 path = "src/lib.rs"
 
 [dependencies]
-slog = "1"
+slog = ">= 2.0.0-1.0, < 2.0.0-2"
 regex = "0.1"
-slog-term = "1.0.0-alpha8"
-slog-stdlog = "1.0.0-alpha8"
+slog-term = ">= 2.0.0-1, < 2.0.0-2"
+slog-stdlog = ">= 2.0.0-0, < 2.0.0-1"
+slog-scope = ">= 2.0.0-1, < 2.0.0-2"
+slog-async = ">= 2.0.0-1, < 2.0.0-2"
 log = "0.3.6"
 
 [[test]]

examples/proper.rs

@@ -1,28 +1,45 @@
 extern crate slog_stdlog;
 extern crate slog_envlogger;
 extern crate slog_term;
+extern crate slog_scope;
+extern crate slog_async;
 
 /// Import longer-name versions of macros only to not collide with legacy `log`
-#[macro_use(slog_error, slog_info, slog_trace, slog_log, o)]
+#[macro_use(slog_error, slog_info, slog_trace, slog_log, o, slog_record,
+            slog_record_static, slog_b)]
 extern crate slog;
 
-use slog::DrainExt;
+use slog::Drain;
+use std::sync::Arc;
 
 #[macro_use]
 extern crate log;
 
 fn main() {
-    let term = slog_term::streamer().build();
-    let drain = slog_envlogger::new(term);
+    let drain =
+        slog_async::Async::default(
+        slog_envlogger::new(
+        slog_term::CompactFormat::new(
+            slog_term::TermDecorator::new()
+            .stderr().build()
+            ).build().fuse()
+        ));
 
-    let root_logger = slog::Logger::root(drain.fuse(), o!("build" => "8jdkj2df", "version" => "0.1.5"));
+    let root_logger = slog::Logger::root(Arc::new(drain.fuse()), o!("build" => "8jdkj2df", "version" => "0.1.5"));
 
-    slog_stdlog::set_logger(root_logger.clone()).unwrap();
+    slog_stdlog::init().unwrap();
 
-    slog_error!(root_logger, "slog error");
-    error!("log error");
-    slog_info!(root_logger, "slog info");
-    info!("log info");
-    slog_trace!(root_logger, "slog trace");
-    trace!("log trace");
+    //slog_scope::set_global_logger(root_logger.clone().into_erased());
+    slog_scope::scope(
+        root_logger.clone().into_erased(),
+        || {
+
+            slog_error!(root_logger, "slog error");
+            error!("log error");
+            slog_info!(root_logger, "slog info");
+            info!("log info");
+            slog_trace!(root_logger, "slog trace");
+            trace!("log trace");
+        }
+        );
 }

examples/scopes.rs

@@ -1,5 +1,6 @@
 extern crate slog_stdlog;
 extern crate slog_envlogger;
+extern crate slog_scope;
 
 #[macro_use(o)]
 extern crate slog;
@@ -12,8 +13,8 @@ fn main() {
 
     error!("log error");
 
-    slog_stdlog::scope(
-        slog_stdlog::with_current_logger(|l| l.new(o!("scope-extra-data" => "data"))),
+    slog_scope::scope(
+        slog_scope::logger().new(o!("scope-extra-data" => "data")),
         || foo()
     );
 
@@ -24,8 +25,8 @@ fn foo() {
     info!("log info inside foo");
 
     // scopes can be nested!
-    slog_stdlog::scope(
-        slog_stdlog::with_current_logger(|l| l.new(o!("even-more-scope-extra-data" => "data2"))),
+    slog_scope::scope(
+        slog_scope::logger().new(o!("even-more-scope-extra-data" => "data2")),
         || bar()
     );
 }

src/lib.rs

@@ -76,10 +76,12 @@ extern crate regex;
 extern crate slog;
 extern crate slog_term;
 extern crate slog_stdlog;
+extern crate slog_scope;
+extern crate slog_async;
 extern crate log;
 
 use regex::Regex;
-use std::{env, result};
+use std::{env, result, sync};
 use std::cell::RefCell;
 use slog::*;
 
@@ -205,9 +207,11 @@ impl<T : Drain> EnvLogger<T> {
     }
 }
 
-impl<T : Drain> Drain for EnvLogger<T> {
-    type Error = T::Error;
-    fn log(&self, info: &Record, val : &OwnedKeyValueList) -> result::Result<(), T::Error> {
+impl<T : Drain> Drain for EnvLogger<T>
+where T : Drain<Ok=()> {
+    type Err = T::Err;
+    type Ok = ();
+    fn log(&self, info: &Record, val : &OwnedKVList) -> result::Result<(), T::Err> {
         if !self.enabled(info.level(), info.module()) {
             return Ok(());
         }
@@ -253,10 +257,14 @@ pub fn new<T : Drain>(d : T) -> EnvLogger<T> {
 /// anything that `slog` has to offer, so I highly encourage to use `new()`
 /// instead and explicitly configure your loggers.
 pub fn init() -> std::result::Result<(), log::SetLoggerError> {
-    let term = slog_term::streamer().full().sync().stderr().build();
-    let drain = new(term);
-
-    slog_stdlog::set_logger(Logger::root(drain.fuse(), o!()))
+    let drain = slog_term::CompactFormat::new(
+        slog_term::TermDecorator::new().stderr().build()
+        ).build();
+    let drain = new(drain);
+    let drain = sync::Mutex::new(drain.fuse());
+
+    slog_scope::set_global_logger(Logger::root(drain.fuse(), o!()).into_erased());
+    slog_stdlog::init()
 }
 
 /// Parse a logging specification string (e.g: "crate1,crate2::mod3,crate3::x=error/foo")