diff options
author | Chris Larson <chris_larson@mentor.com> | 2010-06-10 10:35:31 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2011-01-04 14:46:33 +0000 |
commit | ecc68fa4fbb579e97ea45156e79a293b073697a0 (patch) | |
tree | 6d08682e43476e37ccf48ee14c8d81e208d1c897 /bitbake/lib/bb/__init__.py | |
parent | d3a45c7d41a88d79389fc40eb68816e4939fb6f9 (diff) | |
download | poky-ecc68fa4fbb579e97ea45156e79a293b073697a0.tar.gz |
Switch bitbake internals to use logging directly rather than bb.msg
We use a custom Logger subclass for our loggers
This logger provides:
- 'debug' method which accepts a debug level
- 'plain' method which bypasses log formatting
- 'verbose' method which is more detail than info, but less than debug
(Bitbake rev: 3b2c1fe5ca56daebb24073a9dd45723d3efd2a8d)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/__init__.py')
-rw-r--r-- | bitbake/lib/bb/__init__.py | 31 |
1 files changed, 25 insertions, 6 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index 8cda4255bc..11983f0e0e 100644 --- a/bitbake/lib/bb/__init__.py +++ b/bitbake/lib/bb/__init__.py | |||
@@ -35,7 +35,25 @@ class NullHandler(logging.Handler): | |||
35 | def emit(self, record): | 35 | def emit(self, record): |
36 | pass | 36 | pass |
37 | 37 | ||
38 | Logger = logging.getLoggerClass() | ||
39 | class BBLogger(Logger): | ||
40 | def __init__(self, name): | ||
41 | if name.split(".")[0] == "BitBake": | ||
42 | self.debug = self.bbdebug | ||
43 | Logger.__init__(self, name) | ||
44 | |||
45 | def bbdebug(self, level, msg, *args, **kwargs): | ||
46 | return self.log(logging.DEBUG - level - 1, msg, *args, **kwargs) | ||
47 | |||
48 | def plain(self, msg, *args, **kwargs): | ||
49 | return self.log(logging.INFO + 1, msg, *args, **kwargs) | ||
50 | |||
51 | def verbose(self, msg, *args, **kwargs): | ||
52 | return self.log(logging.INFO - 1, msg, *args, **kwargs) | ||
53 | |||
38 | logging.raiseExceptions = False | 54 | logging.raiseExceptions = False |
55 | logging.setLoggerClass(BBLogger) | ||
56 | |||
39 | logger = logging.getLogger("BitBake") | 57 | logger = logging.getLogger("BitBake") |
40 | logger.addHandler(NullHandler()) | 58 | logger.addHandler(NullHandler()) |
41 | logger.setLevel(logging.INFO) | 59 | logger.setLevel(logging.INFO) |
@@ -48,22 +66,23 @@ if "BBDEBUG" in os.environ: | |||
48 | 66 | ||
49 | # Messaging convenience functions | 67 | # Messaging convenience functions |
50 | def plain(*args): | 68 | def plain(*args): |
51 | bb.msg.plain(''.join(args)) | 69 | logger.plain(''.join(args)) |
52 | 70 | ||
53 | def debug(lvl, *args): | 71 | def debug(lvl, *args): |
54 | bb.msg.debug(lvl, None, ''.join(args)) | 72 | logger.debug(lvl, ''.join(args)) |
55 | 73 | ||
56 | def note(*args): | 74 | def note(*args): |
57 | bb.msg.note(1, None, ''.join(args)) | 75 | logger.info(''.join(args)) |
58 | 76 | ||
59 | def warn(*args): | 77 | def warn(*args): |
60 | bb.msg.warn(None, ''.join(args)) | 78 | logger.warn(''.join(args)) |
61 | 79 | ||
62 | def error(*args): | 80 | def error(*args): |
63 | bb.msg.error(None, ''.join(args)) | 81 | logger.error(''.join(args)) |
64 | 82 | ||
65 | def fatal(*args): | 83 | def fatal(*args): |
66 | bb.msg.fatal(None, ''.join(args)) | 84 | logger.critical(''.join(args)) |
85 | sys.exit(1) | ||
67 | 86 | ||
68 | 87 | ||
69 | def deprecated(func, name = None, advice = ""): | 88 | def deprecated(func, name = None, advice = ""): |