diff options
| -rwxr-xr-x | bin/bitbake-worker | 2 | ||||
| -rw-r--r-- | lib/bb/__init__.py | 2 | ||||
| -rw-r--r-- | lib/bb/msg.py | 22 | ||||
| -rw-r--r-- | lib/bb/runqueue.py | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/bin/bitbake-worker b/bin/bitbake-worker index 1e641e81c..fc28a34d8 100755 --- a/bin/bitbake-worker +++ b/bin/bitbake-worker @@ -414,7 +414,7 @@ class BitbakeWorker(object): def handle_workerdata(self, data): self.workerdata = pickle.loads(data) - bb.msg.loggerDefaultDebugLevel = self.workerdata["logdefaultdebug"] + bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] diff --git a/lib/bb/__init__.py b/lib/bb/__init__.py index acd4af13a..dc5e91e29 100644 --- a/lib/bb/__init__.py +++ b/lib/bb/__init__.py @@ -47,7 +47,7 @@ class BBLogger(Logger): if not bb.event.worker_pid: if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): return - if level > (bb.msg.loggerDefaultDebugLevel): + if loglevel > bb.msg.loggerDefaultLogLevel: return return self.log(loglevel, msg, *args, **kwargs) diff --git a/lib/bb/msg.py b/lib/bb/msg.py index d1b0e929d..ea6a9543f 100644 --- a/lib/bb/msg.py +++ b/lib/bb/msg.py @@ -135,7 +135,7 @@ class BBLogFilterStdOut(BBLogFilter): # Message control functions # -loggerDefaultDebugLevel = 0 +loggerDefaultLogLevel = BBLogFormatter.NOTE loggerDefaultVerbose = False loggerVerboseLogs = False loggerDefaultDomains = {} @@ -144,11 +144,17 @@ def init_msgconfig(verbose, debug, debug_domains=None): """ Set default verbosity and debug levels config the logger """ - bb.msg.loggerDefaultDebugLevel = debug bb.msg.loggerDefaultVerbose = verbose if verbose: bb.msg.loggerVerboseLogs = True + if debug: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.DEBUG - debug + 1 + elif verbose: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.VERBOSE + else: + bb.msg.loggerDefaultLogLevel = BBLogFormatter.NOTE + bb.msg.loggerDefaultDomains = {} if debug_domains: for (domainarg, iterator) in groupby(debug_domains): @@ -156,17 +162,7 @@ def init_msgconfig(verbose, debug, debug_domains=None): bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 def constructLogOptions(): - debug = loggerDefaultDebugLevel - verbose = loggerDefaultVerbose - - if debug: - level = BBLogFormatter.DEBUG - debug + 1 - elif verbose: - level = BBLogFormatter.VERBOSE - else: - level = BBLogFormatter.NOTE - - return level, loggerDefaultDomains + return loggerDefaultLogLevel, loggerDefaultDomains def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): level, debug_domains = constructLogOptions() diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 32966b4f7..4106fa4bc 100644 --- a/lib/bb/runqueue.py +++ b/lib/bb/runqueue.py @@ -1254,7 +1254,7 @@ class RunQueue: "fakerootdirs" : self.rqdata.dataCaches[mc].fakerootdirs, "fakerootnoenv" : self.rqdata.dataCaches[mc].fakerootnoenv, "sigdata" : bb.parse.siggen.get_taskdata(), - "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, + "logdefaultlevel" : bb.msg.loggerDefaultLogLevel, "logdefaultverbose" : bb.msg.loggerDefaultVerbose, "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, "logdefaultdomain" : bb.msg.loggerDefaultDomains, |