Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #20517 - Fix the env_logger update (from Eijebong:fix_log); r=mbrubeck

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.

Source-Repo: https://github.com/servo/servo
Source-Revision: 6b7957d9a009af5e5b5d36df70f100a5b5b64917

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ad45a255d8b09e93fa567a393dafcc54fcf1b8e0
This commit is contained in:
Bastien Orivel 2018-04-03 09:14:41 -04:00
parent 9b050d739e
commit 42ec4ad2f1
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servo/components/servo/lib.rs
View File

@ -404,13 +404,15 @@ impl<Window> Servo<Window> where Window: WindowMethods + 'static {
pub fn setup_logging(&self) {
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 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);
log::set_boxed_logger(Box::new(logger)).expect("Failed to set logger.");
log::set_max_level(filter);
}
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) {
let env_logger = EnvLoggerBuilder::new().build();
let con_logger = FromScriptLogger::new(script_to_constellation_chan);
let filter = max(env_logger.filter(), con_logger.filter());
log::set_max_level(filter);
let env = env_logger::Env::default();
let env_logger = EnvLoggerBuilder::from_env(env).build();
let filter = max(env_logger.filter(), con_logger.filter());
let logger = BothLogger(env_logger, con_logger);
log::set_boxed_logger(Box::new(logger)).expect("Failed to set logger.");
log::set_max_level(filter);
}
/// Content process entry point.