From 8c7ce991eb8e85a149f39b5441a537c07d8adb10 Mon Sep 17 00:00:00 2001 From: Svyatoslav Nikolsky Date: Fri, 1 Sep 2017 14:04:33 +0300 Subject: [PATCH] honour RUST_LOG when running without '-q' option --- logs/src/lib.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/logs/src/lib.rs b/logs/src/lib.rs index 4e81986d..217bb472 100644 --- a/logs/src/lib.rs +++ b/logs/src/lib.rs @@ -3,6 +3,7 @@ extern crate log; extern crate env_logger; extern crate time; +use std::env; use ansi_term::Colour as Color; use log::{LogRecord, LogLevel}; use env_logger::LogBuilder; @@ -46,7 +47,12 @@ impl LogFormatter for DateAndColorLogFormatter { pub fn init(filters: &str, formatter: T) where T: LogFormatter { let mut builder = LogBuilder::new(); - builder.parse(filters); + let filters = match env::var("RUST_LOG") { + Ok(env_filters) => format!("{},{}", env_filters, filters), + Err(_) => filters.into(), + }; + + builder.parse(&filters); builder.format(move |record| formatter.format(record)); builder.init().expect("Logger can be initialized only once"); }