From f9d7e9e3be89ac9141fb0eb7c71eef5a9a82add9 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Tue, 29 Jun 2010 13:32:04 +0100 Subject: [PATCH] bitbake: Move the logger initialization from cooker to utils In order to move the environment cleaning, which wants to log a message, before cooker creation, the logging facility initialization needs to happen earlier. So, it is now in init_logger in utils.py and called from bitbake before the creation of the data object. It also seems more correct to initialize a global facility like this from a more global context than the creation of an object, of which there could theoretically be many. Signed-off-by: Jeff Dike Signed-off-by: Richard Purdie --- bitbake/bin/bitbake | 3 +++ bitbake/lib/bb/cooker.py | 11 ----------- bitbake/lib/bb/utils.py | 16 ++++++++++++++++ 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake index 1a45ec4f79..0f4ff88171 100755 --- a/bitbake/bin/bitbake +++ b/bitbake/bin/bitbake @@ -152,6 +152,9 @@ Default BBFILES are the .bb files in the current directory.""" ) # server is daemonized this logfile will be truncated. cooker_logfile = os.path.join (os.getcwd(), "cooker.log") + bb.utils.init_logger(bb.msg, configuration.verbose, configuration.debug, + configuration.debug_domains) + cooker = bb.cooker.BBCooker(configuration, server) # Clear away any spurious environment variables. But don't wipe the diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 3881df484a..2406dfe95b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -72,17 +72,6 @@ class BBCooker: self.configuration = configuration - if self.configuration.verbose: - bb.msg.set_verbose(True) - - if self.configuration.debug: - bb.msg.set_debug_level(self.configuration.debug) - else: - bb.msg.set_debug_level(0) - - if self.configuration.debug_domains: - bb.msg.set_debug_domains(self.configuration.debug_domains) - self.configuration.data = bb.data.init() bb.data.inheritFromOS(self.configuration.data) diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index ad0aa68b27..40326f98d2 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -614,3 +614,19 @@ def which(path, item, direction = 0): return next return "" + +def init_logger(logger, verbose, debug, debug_domains): + """ + Set verbosity and debug levels in the logger + """ + + if verbose: + logger.set_verbose(True) + + if debug: + logger.set_debug_level(debug) + else: + logger.set_debug_level(0) + + if debug_domains: + logger.set_debug_domains(debug_domains)