From 6bab6057b3b4210b6efea1775a31d7ffb08af159 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Fri, 7 Dec 2012 11:44:11 -0800 Subject: [PATCH] Bug 818649 - Ensure mach logs are written to log file; r=jhammel DONTBUILD (NPOTB) --- python/mach/mach/logging.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/python/mach/mach/logging.py b/python/mach/mach/logging.py index dc8f3346971..ec90f2f5b9b 100644 --- a/python/mach/mach/logging.py +++ b/python/mach/mach/logging.py @@ -112,11 +112,10 @@ class StructuredTerminalFormatter(StructuredHumanFormatter): class LoggingManager(object): """Holds and controls global logging state. - A mozbuild application should instantiate one of these and configure it - as needed. + An application should instantiate one of these and configure it as needed. This class provides a mechanism to configure the output of logging data - both from mozbuild and from the overall logging system (e.g. from other + both from mach and from the overall logging system (e.g. from other modules). """ @@ -135,12 +134,12 @@ class LoggingManager(object): # complaining about "no handlers could be found for logger XXX." self.root_logger.addHandler(logging.NullHandler()) - self.mozbuild_logger = logging.getLogger('mozbuild') - self.mozbuild_logger.setLevel(logging.DEBUG) + self.mach_logger = logging.getLogger('mach') + self.mach_logger.setLevel(logging.DEBUG) self.structured_filter = ConvertToStructuredFilter() - self.structured_loggers = [self.mozbuild_logger] + self.structured_loggers = [self.mach_logger] self._terminal = None @@ -227,6 +226,6 @@ class LoggingManager(object): """Register a structured logger. This needs to be called for all structured loggers that don't chain up - to the mozbuild logger in order for their output to be captured. + to the mach logger in order for their output to be captured. """ self.structured_loggers.append(logger)