diff options
-rwxr-xr-x | bitbake/bin/bitbake-worker | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/__init__.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/msg.py | 22 | ||||
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 1e641e81c2..fc28a34d8a 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker | |||
@@ -414,7 +414,7 @@ class BitbakeWorker(object): | |||
414 | 414 | ||
415 | def handle_workerdata(self, data): | 415 | def handle_workerdata(self, data): |
416 | self.workerdata = pickle.loads(data) | 416 | self.workerdata = pickle.loads(data) |
417 | bb.msg.loggerDefaultDebugLevel = self.workerdata["logdefaultdebug"] | 417 | bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] |
418 | bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] | 418 | bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] |
419 | bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] | 419 | bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] |
420 | bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] | 420 | bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] |
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index acd4af13a8..dc5e91e29a 100644 --- a/bitbake/lib/bb/__init__.py +++ b/bitbake/lib/bb/__init__.py | |||
@@ -47,7 +47,7 @@ class BBLogger(Logger): | |||
47 | if not bb.event.worker_pid: | 47 | if not bb.event.worker_pid: |
48 | if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): | 48 | if self.name in bb.msg.loggerDefaultDomains and loglevel > (bb.msg.loggerDefaultDomains[self.name]): |
49 | return | 49 | return |
50 | if level > (bb.msg.loggerDefaultDebugLevel): | 50 | if loglevel > bb.msg.loggerDefaultLogLevel: |
51 | return | 51 | return |
52 | return self.log(loglevel, msg, *args, **kwargs) | 52 | return self.log(loglevel, msg, *args, **kwargs) |
53 | 53 | ||
diff --git a/bitbake/lib/bb/msg.py b/bitbake/lib/bb/msg.py index d1b0e929d4..ea6a9543f7 100644 --- a/bitbake/lib/bb/msg.py +++ b/bitbake/lib/bb/msg.py | |||
@@ -135,7 +135,7 @@ class BBLogFilterStdOut(BBLogFilter): | |||
135 | # Message control functions | 135 | # Message control functions |
136 | # | 136 | # |
137 | 137 | ||
138 | loggerDefaultDebugLevel = 0 | 138 | loggerDefaultLogLevel = BBLogFormatter.NOTE |
139 | loggerDefaultVerbose = False | 139 | loggerDefaultVerbose = False |
140 | loggerVerboseLogs = False | 140 | loggerVerboseLogs = False |
141 | loggerDefaultDomains = {} | 141 | loggerDefaultDomains = {} |
@@ -144,11 +144,17 @@ def init_msgconfig(verbose, debug, debug_domains=None): | |||
144 | """ | 144 | """ |
145 | Set default verbosity and debug levels config the logger | 145 | Set default verbosity and debug levels config the logger |
146 | """ | 146 | """ |
147 | bb.msg.loggerDefaultDebugLevel = debug | ||
148 | bb.msg.loggerDefaultVerbose = verbose | 147 | bb.msg.loggerDefaultVerbose = verbose |
149 | if verbose: | 148 | if verbose: |
150 | bb.msg.loggerVerboseLogs = True | 149 | bb.msg.loggerVerboseLogs = True |
151 | 150 | ||
151 | if debug: | ||
152 | bb.msg.loggerDefaultLogLevel = BBLogFormatter.DEBUG - debug + 1 | ||
153 | elif verbose: | ||
154 | bb.msg.loggerDefaultLogLevel = BBLogFormatter.VERBOSE | ||
155 | else: | ||
156 | bb.msg.loggerDefaultLogLevel = BBLogFormatter.NOTE | ||
157 | |||
152 | bb.msg.loggerDefaultDomains = {} | 158 | bb.msg.loggerDefaultDomains = {} |
153 | if debug_domains: | 159 | if debug_domains: |
154 | for (domainarg, iterator) in groupby(debug_domains): | 160 | for (domainarg, iterator) in groupby(debug_domains): |
@@ -156,17 +162,7 @@ def init_msgconfig(verbose, debug, debug_domains=None): | |||
156 | bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 | 162 | bb.msg.loggerDefaultDomains["BitBake.%s" % domainarg] = logging.DEBUG - dlevel + 1 |
157 | 163 | ||
158 | def constructLogOptions(): | 164 | def constructLogOptions(): |
159 | debug = loggerDefaultDebugLevel | 165 | return loggerDefaultLogLevel, loggerDefaultDomains |
160 | verbose = loggerDefaultVerbose | ||
161 | |||
162 | if debug: | ||
163 | level = BBLogFormatter.DEBUG - debug + 1 | ||
164 | elif verbose: | ||
165 | level = BBLogFormatter.VERBOSE | ||
166 | else: | ||
167 | level = BBLogFormatter.NOTE | ||
168 | |||
169 | return level, loggerDefaultDomains | ||
170 | 166 | ||
171 | def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): | 167 | def addDefaultlogFilter(handler, cls = BBLogFilter, forcelevel=None): |
172 | level, debug_domains = constructLogOptions() | 168 | level, debug_domains = constructLogOptions() |
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 32966b4f7c..4106fa4bc4 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1254,7 +1254,7 @@ class RunQueue: | |||
1254 | "fakerootdirs" : self.rqdata.dataCaches[mc].fakerootdirs, | 1254 | "fakerootdirs" : self.rqdata.dataCaches[mc].fakerootdirs, |
1255 | "fakerootnoenv" : self.rqdata.dataCaches[mc].fakerootnoenv, | 1255 | "fakerootnoenv" : self.rqdata.dataCaches[mc].fakerootnoenv, |
1256 | "sigdata" : bb.parse.siggen.get_taskdata(), | 1256 | "sigdata" : bb.parse.siggen.get_taskdata(), |
1257 | "logdefaultdebug" : bb.msg.loggerDefaultDebugLevel, | 1257 | "logdefaultlevel" : bb.msg.loggerDefaultLogLevel, |
1258 | "logdefaultverbose" : bb.msg.loggerDefaultVerbose, | 1258 | "logdefaultverbose" : bb.msg.loggerDefaultVerbose, |
1259 | "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, | 1259 | "logdefaultverboselogs" : bb.msg.loggerVerboseLogs, |
1260 | "logdefaultdomain" : bb.msg.loggerDefaultDomains, | 1260 | "logdefaultdomain" : bb.msg.loggerDefaultDomains, |