From 42ec4ad2f16a2b8bb7f115dcdfe0b33134fa8ecc Mon Sep 17 00:00:00 2001 From: Bastien Orivel Date: Tue, 3 Apr 2018 09:14:41 -0400 Subject: [PATCH] servo: Merge #20517 - Fix the env_logger update (from Eijebong:fix_log); r=mbrubeck 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 --- servo/components/servo/lib.rs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/servo/components/servo/lib.rs b/servo/components/servo/lib.rs index 6de31837e73f..1d8e64ab8e42 100644 --- a/servo/components/servo/lib.rs +++ b/servo/components/servo/lib.rs @@ -404,13 +404,15 @@ impl Servo 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 Log for BothLogger 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.