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 <jdike@linux.intel.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
132122e313
commit
f9d7e9e3be
|
@ -152,6 +152,9 @@ Default BBFILES are the .bb files in the current directory.""" )
|
||||||
# server is daemonized this logfile will be truncated.
|
# server is daemonized this logfile will be truncated.
|
||||||
cooker_logfile = os.path.join (os.getcwd(), "cooker.log")
|
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)
|
cooker = bb.cooker.BBCooker(configuration, server)
|
||||||
|
|
||||||
# Clear away any spurious environment variables. But don't wipe the
|
# Clear away any spurious environment variables. But don't wipe the
|
||||||
|
|
|
@ -72,17 +72,6 @@ class BBCooker:
|
||||||
|
|
||||||
self.configuration = configuration
|
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()
|
self.configuration.data = bb.data.init()
|
||||||
|
|
||||||
bb.data.inheritFromOS(self.configuration.data)
|
bb.data.inheritFromOS(self.configuration.data)
|
||||||
|
|
|
@ -614,3 +614,19 @@ def which(path, item, direction = 0):
|
||||||
return next
|
return next
|
||||||
|
|
||||||
return ""
|
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)
|
||||||
|
|
Loading…
Reference in New Issue