grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update log -> 0.4, env_logger -> 0.5. (#9294)

Browse Source 
* Rename a few types & methods.

* Change `(Log)Builder::format` (closure) arg.
This commit is contained in:
Nick Sanders
2018-08-09 16:04:10 -07:00
committed by André Silva
parent b28e742683
commit e590874a81
41 changed files with 168 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
logger/src/lib.rs
View File

@@ -33,7 +33,7 @@ mod rotating;
use std::{env, thread, fs};
use std::sync::{Weak, Arc};
use std::io::Write;
use env_logger::LogBuilder;
use env_logger::{Builder as LogBuilder, Formatter};
use regex::Regex;
use ansi_term::Colour;
use parking_lot::Mutex;
@@ -68,12 +68,12 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
let mut levels = String::new();
let mut builder = LogBuilder::new();
// Disable info logging by default for some modules:
builder.filter(Some("ws"), LogLevelFilter::Warn);
builder.filter(Some("reqwest"), LogLevelFilter::Warn);
builder.filter(Some("hyper"), LogLevelFilter::Warn);
builder.filter(Some("rustls"), LogLevelFilter::Error);
builder.filter(Some("ws"), LevelFilter::Warn);
builder.filter(Some("reqwest"), LevelFilter::Warn);
builder.filter(Some("hyper"), LevelFilter::Warn);
builder.filter(Some("rustls"), LevelFilter::Error);
// Enable info for others.
builder.filter(None, LogLevelFilter::Info);
builder.filter(None, LevelFilter::Info);
if let Ok(lvl) = env::var("RUST_LOG") {
levels.push_str(&lvl);
@@ -99,10 +99,10 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
None => None,
};
let format = move |record: &LogRecord| {
let format = move |buf: &mut Formatter, record: &Record| {
let timestamp = time::strftime("%Y-%m-%d %H:%M:%S %Z", &time::now()).unwrap();
let with_color = if max_log_level() <= LogLevelFilter::Info {
let with_color = if max_level() <= LevelFilter::Info {
format!("{} {}", Colour::Black.bold().paint(timestamp), record.args())
} else {
let name = thread::current().name().map_or_else(Default::default, |x| format!("{}", Colour::Blue.bold().paint(x)));
@@ -122,16 +122,16 @@ pub fn setup_log(config: &Config) -> Result<Arc<RotatingLogger>, String> {
let _ = file.write_all(b"\n");
}
logger.append(removed_color);
if !isatty && record.level() <= LogLevel::Info && atty::is(atty::Stream::Stdout) {
if !isatty && record.level() <= Level::Info && atty::is(atty::Stream::Stdout) {
// duplicate INFO/WARN output to console
println!("{}", ret);
}
ret
write!(buf, "{}", ret)
};
builder.format(format);
builder.init()
builder.try_init()
.and_then(|_| {
*ROTATING_LOGGER.lock() = Arc::downgrade(&logs);
Ok(logs)

8
logger/src/rotating.rs
View File

@@ -17,8 +17,8 @@
//! Common log helper functions
use std::env;
use rlog::LogLevelFilter;
use env_logger::LogBuilder;
use rlog::LevelFilter;
use env_logger::Builder as LogBuilder;
use arrayvec::ArrayVec;
use parking_lot::{RwLock, RwLockReadGuard};
@@ -26,13 +26,13 @@ use parking_lot::{RwLock, RwLockReadGuard};
lazy_static! {
static ref LOG_DUMMY: () = {
let mut builder = LogBuilder::new();
builder.filter(None, LogLevelFilter::Info);
builder.filter(None, LevelFilter::Info);
if let Ok(log) = env::var("RUST_LOG") {
builder.parse(&log);
}
if !builder.init().is_ok() {
if !builder.try_init().is_ok() {
println!("logger initialization failed!");
}
};