Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix the env_logger update

Browse source 
When building an env_logger, we need to pass it the environment,
otherwise it just takes some defaults and doesn't log anything.
This commit is contained in:
Bastien Orivel 2018-04-03 12:03:41 +02:00
parent 0a3ffc0c60
commit 04d1e12806
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/servo/lib.rs
View file

@ -404,13 +404,15 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static {
pub fn setup_logging(&self) { pub fn setup_logging(&self) {
let constellation_chan = self.constellation_chan.clone(); let constellation_chan = self.constellation_chan.clone();
let env_logger = EnvLoggerBuilder::new().build(); let env = env_logger::Env::default();
let env_logger = EnvLoggerBuilder::from_env(env).build();
let con_logger = FromCompositorLogger::new(constellation_chan); let con_logger = FromCompositorLogger::new(constellation_chan);
let filter = max(env_logger.filter(), con_logger.filter());
log::set_max_level(filter);
let filter = max(env_logger.filter(), con_logger.filter());
let logger = BothLogger(env_logger, con_logger); let logger = BothLogger(env_logger, con_logger);
log::set_boxed_logger(Box::new(logger)).expect("Failed to set logger."); log::set_boxed_logger(Box::new(logger)).expect("Failed to set logger.");
log::set_max_level(filter);
} }
pub fn deinit(self) { pub fn deinit(self) {
@ -564,13 +566,15 @@ impl<Log1, Log2> Log for BothLogger<Log1, Log2> where Log1: Log, Log2: Log {
} }
pub fn set_logger(script_to_constellation_chan: ScriptToConstellationChan) { pub fn set_logger(script_to_constellation_chan: ScriptToConstellationChan) {
let env_logger = EnvLoggerBuilder::new().build();
let con_logger = FromScriptLogger::new(script_to_constellation_chan); let con_logger = FromScriptLogger::new(script_to_constellation_chan);
let filter = max(env_logger.filter(), con_logger.filter()); let env = env_logger::Env::default();
log::set_max_level(filter); let env_logger = EnvLoggerBuilder::from_env(env).build();
let filter = max(env_logger.filter(), con_logger.filter());
let logger = BothLogger(env_logger, con_logger); let logger = BothLogger(env_logger, con_logger);
log::set_boxed_logger(Box::new(logger)).expect("Failed to set logger."); log::set_boxed_logger(Box::new(logger)).expect("Failed to set logger.");
log::set_max_level(filter);
} }
/// Content process entry point. /// Content process entry point.