Merge pull request #57 from alexcrichton/log-in-log

Avoid panicking for logging-while-logging

Author: KodrAus

Cargo.toml

@@ -23,5 +23,9 @@ chrono = "0.4"
 name = "regexp_filter"
 harness = false
 
+[[test]]
+name = "log-in-log"
+harness = false
+
 [features]
 default = ["regex"]

src/lib.rs

@@ -468,7 +468,19 @@ impl Log for Logger {
             }
 
             FORMATTER.with(|tl_buf| {
-                let mut tl_buf = tl_buf.borrow_mut();
+                // It's possible for implementations to sometimes
+                // log-while-logging (e.g. a `std::fmt` implementation logs
+                // internally) but it's super rare. If this happens make sure we
+                // at least don't panic and ship some output to the screen.
+                let mut a;
+                let mut b = None;
+                let tl_buf = match tl_buf.try_borrow_mut() {
+                    Ok(f) => {
+                        a = f;
+                        &mut *a
+                    }
+                    Err(_) => &mut b,
+                };
 
                 // Check the buffer style. If it's different from the logger's 
                 // style then drop the buffer and recreate it.

tests/log-in-log.rs

@@ -0,0 +1,38 @@
+#[macro_use] extern crate log;
+extern crate env_logger;
+
+use std::process;
+use std::fmt;
+use std::env;
+use std::str;
+
+struct Foo;
+
+impl fmt::Display for Foo {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        info!("test");
+        f.write_str("bar")
+    }
+}
+
+fn main() {
+    env_logger::init();
+    if env::var("YOU_ARE_TESTING_NOW").is_ok() {
+        return info!("{}", Foo);
+    }
+
+    let exe = env::current_exe().unwrap();
+    let out = process::Command::new(exe)
+        .env("YOU_ARE_TESTING_NOW", "1")
+        .env("RUST_LOG", "debug")
+        .output()
+        .unwrap_or_else(|e| panic!("Unable to start child process: {}", e));
+    if out.status.success() {
+        return
+    }
+
+    println!("test failed: {}", out.status);
+    println!("--- stdout\n{}", str::from_utf8(&out.stdout).unwrap());
+    println!("--- stderr\n{}", str::from_utf8(&out.stderr).unwrap());
+    process::exit(1);
+}