1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
1 |
# Copyright (C) 2005, Canonical Ltd
|
1
by mbp at sourcefrog
import from baz patch-364 |
2 |
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
3 |
"""Messages and logging for bazaar-ng.
|
4 |
||
5 |
Messages are supplied by callers as a string-formatting template, plus values
|
|
6 |
to be inserted into it. The actual %-formatting is deferred to the log
|
|
7 |
library so that it doesn't need to be done for messages that won't be emitted.
|
|
8 |
||
9 |
Messages are classified by severity levels: critical, error, warning, info,
|
|
10 |
and debug.
|
|
11 |
||
12 |
They can be sent to two places: to stderr, and to ~/.bzr.log. For purposes
|
|
13 |
such as running the test suite, they can also be redirected away from both of
|
|
14 |
those two places to another location.
|
|
15 |
||
16 |
~/.bzr.log gets all messages, and full tracebacks for uncaught exceptions.
|
|
1185.33.51
by Martin Pool
Fix trace of non-ascii messages, and add test. |
17 |
This trace file is always in UTF-8, regardless of the user's default encoding,
|
18 |
so that we can always rely on writing any message.
|
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
19 |
|
20 |
Output to stderr depends on the mode chosen by the user. By default, messages
|
|
21 |
of info and above are sent out, which results in progress messages such as the
|
|
22 |
list of files processed by add and commit. In quiet mode, only warnings and
|
|
23 |
above are shown. In debug mode, stderr gets debug messages too.
|
|
24 |
||
25 |
Errors that terminate an operation are generally passed back as exceptions;
|
|
26 |
others may be just emitted as messages.
|
|
27 |
||
28 |
Exceptions are reported in a brief form to stderr so as not to look scary.
|
|
29 |
BzrErrors are required to be able to format themselves into a properly
|
|
30 |
explanatory message. This is not true for builtin excexceptions such as
|
|
31 |
KeyError, which typically just str to "0". They're printed in a different
|
|
32 |
form.
|
|
344
by Martin Pool
- It's not an error to use the library without |
33 |
"""
|
34 |
||
1097
by Martin Pool
- send trace messages out through python logging module |
35 |
# TODO: in debug mode, stderr should get full tracebacks and also
|
36 |
# debug messages. (Is this really needed?)
|
|
37 |
||
1185.16.74
by Martin Pool
doc |
38 |
# FIXME: Unfortunately it turns out that python's logging module
|
39 |
# is quite expensive, even when the message is not printed by any handlers.
|
|
40 |
# We should perhaps change back to just simply doing it here.
|
|
41 |
||
1097
by Martin Pool
- send trace messages out through python logging module |
42 |
|
43 |
import sys |
|
44 |
import os |
|
45 |
import logging |
|
46 |
||
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
47 |
import bzrlib |
1185.33.63
by Martin Pool
Better display of BzrError classes that are not BzrNewErrors. |
48 |
from bzrlib.errors import BzrError, BzrNewError |
1185.33.7
by Martin Pool
Better formatting of builtin errors |
49 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
50 |
|
1101
by Martin Pool
- add global definition to quieten pychecker |
51 |
_file_handler = None |
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
52 |
_stderr_handler = None |
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
53 |
_stderr_quiet = False |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
54 |
_trace_file = None |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
55 |
_trace_depth = 0 |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
56 |
_bzr_log_file = None |
57 |
||
1185.49.17
by John Arbash Meinel
[merge] Robey Pointer - some sftp fixes, and an http patch |
58 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
59 |
class QuietFormatter(logging.Formatter): |
60 |
"""Formatter that supresses the details of errors.
|
|
61 |
||
62 |
This is used by default on stderr so as not to scare the user.
|
|
63 |
"""
|
|
64 |
# At first I tried overriding formatException to suppress the
|
|
65 |
# exception details, but that has global effect: no loggers
|
|
66 |
# can get the exception details is we suppress them here.
|
|
67 |
||
68 |
def format(self, record): |
|
69 |
if record.levelno >= logging.WARNING: |
|
1393.1.57
by Martin Pool
- no 'bzr' prefix on info messages |
70 |
s = 'bzr: ' + record.levelname + ': ' |
71 |
else: |
|
72 |
s = '' |
|
1289
by Martin Pool
- wrap wide strings when showing exceptions |
73 |
s += record.getMessage() |
1097
by Martin Pool
- send trace messages out through python logging module |
74 |
if record.exc_info: |
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
75 |
s += '\n' + format_exception_short(record.exc_info) |
1097
by Martin Pool
- send trace messages out through python logging module |
76 |
return s |
77 |
||
78 |
# configure convenient aliases for output routines
|
|
79 |
||
80 |
_bzr_logger = logging.getLogger('bzr') |
|
81 |
||
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
82 |
def note(*args, **kwargs): |
83 |
import bzrlib.ui |
|
84 |
bzrlib.ui.ui_factory.clear_term() |
|
85 |
_bzr_logger.info(*args, **kwargs) |
|
86 |
||
87 |
def warning(*args, **kwargs): |
|
88 |
import bzrlib.ui |
|
89 |
bzrlib.ui.ui_factory.clear_term() |
|
90 |
_bzr_logger.warning(*args, **kwargs) |
|
91 |
||
92 |
info = note |
|
1097
by Martin Pool
- send trace messages out through python logging module |
93 |
log_error = _bzr_logger.error |
94 |
error = _bzr_logger.error |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
95 |
|
96 |
||
97 |
def mutter(fmt, *args): |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
98 |
if _trace_file is None: |
99 |
return
|
|
100 |
if hasattr(_trace_file, 'closed') and _trace_file.closed: |
|
101 |
return
|
|
102 |
if len(args) > 0: |
|
1185.33.51
by Martin Pool
Fix trace of non-ascii messages, and add test. |
103 |
out = fmt % args |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
104 |
else: |
1185.33.51
by Martin Pool
Fix trace of non-ascii messages, and add test. |
105 |
out = fmt |
106 |
out += '\n' |
|
107 |
_trace_file.write(out) |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
108 |
debug = mutter |
1097
by Martin Pool
- send trace messages out through python logging module |
109 |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
110 |
|
261
by Martin Pool
- auto-rollover of .bzr.log |
111 |
def _rollover_trace_maybe(trace_fname): |
359
by Martin Pool
- pychecker fixups |
112 |
import stat |
261
by Martin Pool
- auto-rollover of .bzr.log |
113 |
try: |
114 |
size = os.stat(trace_fname)[stat.ST_SIZE] |
|
333
by Martin Pool
- allow trace file to grow up to 4MB |
115 |
if size <= 4 << 20: |
261
by Martin Pool
- auto-rollover of .bzr.log |
116 |
return
|
117 |
old_fname = trace_fname + '.old' |
|
1185.1.40
by Robert Collins
Merge what applied of Alexander Belchenko's win32 patch. |
118 |
from osutils import rename |
119 |
rename(trace_fname, old_fname) |
|
261
by Martin Pool
- auto-rollover of .bzr.log |
120 |
except OSError: |
121 |
return
|
|
122 |
||
123 |
||
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
124 |
def open_tracefile(tracefilename='~/.bzr.log'): |
59
by mbp at sourcefrog
lift out tracefile creation code |
125 |
# Messages are always written to here, so that we have some
|
126 |
# information if something goes wrong. In a future version this
|
|
127 |
# file will be removed on successful completion.
|
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
128 |
global _file_handler, _bzr_log_file |
359
by Martin Pool
- pychecker fixups |
129 |
import stat, codecs |
59
by mbp at sourcefrog
lift out tracefile creation code |
130 |
|
1185.31.35
by John Arbash Meinel
Couple small fixes, all tests pass on cygwin. |
131 |
trace_fname = os.path.join(os.path.expanduser(tracefilename)) |
261
by Martin Pool
- auto-rollover of .bzr.log |
132 |
_rollover_trace_maybe(trace_fname) |
403
by Martin Pool
- Don't give an error if the trace file can't be opened |
133 |
try: |
1185.33.11
by Martin Pool
Code format cleanups |
134 |
LINE_BUFFERED = 1 |
135 |
tf = codecs.open(trace_fname, 'at', 'utf8', buffering=LINE_BUFFERED) |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
136 |
_bzr_log_file = tf |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
137 |
if tf.tell() == 0: |
1100
by Martin Pool
- fix name error reported by Andrew Bennetts |
138 |
tf.write("\nthis is a debug log for diagnosing/reporting problems in bzr\n") |
139 |
tf.write("you can delete or truncate this file, or include sections in\n") |
|
140 |
tf.write("bug reports to bazaar-ng@lists.canonical.com\n\n") |
|
1097
by Martin Pool
- send trace messages out through python logging module |
141 |
_file_handler = logging.StreamHandler(tf) |
142 |
fmt = r'[%(process)5d] %(asctime)s.%(msecs)03d %(levelname)s: %(message)s' |
|
143 |
datefmt = r'%a %H:%M:%S' |
|
144 |
_file_handler.setFormatter(logging.Formatter(fmt, datefmt)) |
|
145 |
_file_handler.setLevel(logging.DEBUG) |
|
146 |
logging.getLogger('').addHandler(_file_handler) |
|
403
by Martin Pool
- Don't give an error if the trace file can't be opened |
147 |
except IOError, e: |
148 |
warning("failed to open trace file: %s" % (e)) |
|
260
by Martin Pool
- remove atexit() dependency for writing out execution times |
149 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
150 |
|
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
151 |
def log_startup(argv): |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
152 |
debug('\n\nbzr %s invoked on python %s (%s)', |
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
153 |
bzrlib.__version__, |
154 |
'.'.join(map(str, sys.version_info)), |
|
155 |
sys.platform) |
|
156 |
debug(' arguments: %r', argv) |
|
1185.16.73
by Martin Pool
- in error messages, show cwd as repr in case it's in unicode |
157 |
debug(' working dir: %r', os.getcwdu()) |
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
158 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
159 |
|
160 |
def log_exception(msg=None): |
|
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
161 |
"""Log the last exception to stderr and the trace file.
|
1097
by Martin Pool
- send trace messages out through python logging module |
162 |
|
163 |
The exception string representation is used as the error
|
|
164 |
summary, unless msg is given.
|
|
165 |
"""
|
|
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
166 |
if msg: |
1185.43.9
by Martin Pool
Make logging of errors go through our trace functions |
167 |
error(msg) |
168 |
else: |
|
169 |
exc_str = format_exception_short(sys.exc_info()) |
|
170 |
error(exc_str) |
|
171 |
log_exception_quietly() |
|
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
172 |
|
173 |
||
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
174 |
def log_exception_quietly(): |
175 |
"""Log the last exception to the trace file only.
|
|
176 |
||
177 |
Used for exceptions that occur internally and that may be
|
|
178 |
interesting to developers but not to users. For example,
|
|
179 |
errors loading plugins.
|
|
180 |
"""
|
|
1185.33.11
by Martin Pool
Code format cleanups |
181 |
import traceback |
1185.16.82
by mbp at sourcefrog
- give a quieter warning if a plugin can't be loaded |
182 |
debug(traceback.format_exc()) |
183 |
||
184 |
||
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
185 |
def enable_default_logging(): |
186 |
"""Configure default logging to stderr and .bzr.log"""
|
|
1185.43.9
by Martin Pool
Make logging of errors go through our trace functions |
187 |
# FIXME: if this is run twice, things get confused
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
188 |
global _stderr_handler, _file_handler, _trace_file, _bzr_log_file |
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
189 |
_stderr_handler = logging.StreamHandler() |
1359
by Martin Pool
- merge in new BZR_NOISY vs BZR_DEBUG stuff from main |
190 |
_stderr_handler.setFormatter(QuietFormatter()) |
1185.34.2
by Jelmer Vernooij
Don't quite when tracefile can't be opened. Display warning |
191 |
logging.getLogger('').addHandler(_stderr_handler) |
1359
by Martin Pool
- merge in new BZR_NOISY vs BZR_DEBUG stuff from main |
192 |
_stderr_handler.setLevel(logging.INFO) |
1185.34.2
by Jelmer Vernooij
Don't quite when tracefile can't be opened. Display warning |
193 |
if not _file_handler: |
194 |
open_tracefile() |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
195 |
_trace_file = _bzr_log_file |
1185.34.2
by Jelmer Vernooij
Don't quite when tracefile can't be opened. Display warning |
196 |
if _file_handler: |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
197 |
_file_handler.setLevel(logging.DEBUG) |
198 |
_bzr_logger.setLevel(logging.DEBUG) |
|
199 |
||
1359
by Martin Pool
- merge in new BZR_NOISY vs BZR_DEBUG stuff from main |
200 |
|
1185.33.42
by Martin Pool
[patch] make --quiet a global option (robey) |
201 |
|
202 |
def be_quiet(quiet=True): |
|
203 |
global _stderr_handler, _stderr_quiet |
|
204 |
||
205 |
_stderr_quiet = quiet |
|
206 |
if quiet: |
|
207 |
_stderr_handler.setLevel(logging.WARNING) |
|
208 |
else: |
|
209 |
_stderr_handler.setLevel(logging.INFO) |
|
210 |
||
211 |
||
212 |
def is_quiet(): |
|
213 |
global _stderr_quiet |
|
214 |
return _stderr_quiet |
|
215 |
||
216 |
||
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
217 |
def disable_default_logging(): |
218 |
"""Turn off default log handlers.
|
|
219 |
||
220 |
This is intended to be used by the test framework, which doesn't
|
|
221 |
want leakage from the code-under-test into the main logs.
|
|
222 |
"""
|
|
1112
by Martin Pool
- disable standard logging to .bzr.log and stderr while running |
223 |
|
224 |
l = logging.getLogger('') |
|
225 |
l.removeHandler(_stderr_handler) |
|
226 |
if _file_handler: |
|
227 |
l.removeHandler(_file_handler) |
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
228 |
_trace_file = None |
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
229 |
|
230 |
||
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
231 |
def enable_test_log(to_file): |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
232 |
"""Redirect logging to a temporary file for a test
|
233 |
|
|
234 |
returns an opaque reference that should be passed to disable_test_log
|
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
235 |
after the test completes.
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
236 |
"""
|
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
237 |
disable_default_logging() |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
238 |
global _trace_file |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
239 |
global _trace_depth |
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
240 |
hdlr = logging.StreamHandler(to_file) |
241 |
hdlr.setLevel(logging.DEBUG) |
|
242 |
hdlr.setFormatter(logging.Formatter('%(levelname)8s %(message)s')) |
|
1185.43.1
by Martin Pool
Remove direct logging calls from selftest |
243 |
_bzr_logger.addHandler(hdlr) |
244 |
_bzr_logger.setLevel(logging.DEBUG) |
|
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
245 |
result = hdlr, _trace_file, _trace_depth |
1185.43.7
by Martin Pool
Do debug messages not through python logging |
246 |
_trace_file = to_file |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
247 |
_trace_depth += 1 |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
248 |
return result |
249 |
||
250 |
||
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
251 |
def disable_test_log((test_log_hdlr, old_trace_file, old_trace_depth)): |
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
252 |
_bzr_logger.removeHandler(test_log_hdlr) |
1641.2.1
by Olaf Conradi
Close logging handler on disabling the test log. This will remove the |
253 |
test_log_hdlr.close() |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
254 |
global _trace_file |
255 |
global _trace_depth |
|
1534.4.25
by Robert Collins
Add a --transport parameter to the test suite to set the default transport to be used in the test suite. |
256 |
_trace_file = old_trace_file |
1534.11.7
by Robert Collins
Test and correct the problem with nested test logs breaking further in-test logs. |
257 |
_trace_depth = old_trace_depth |
258 |
if not _trace_depth: |
|
259 |
enable_default_logging() |
|
1185.33.13
by Martin Pool
Hide more stuff in bzrlib.trace |
260 |
|
261 |
||
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
262 |
def format_exception_short(exc_info): |
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
263 |
"""Make a short string form of an exception.
|
264 |
||
265 |
This is used for display to stderr. It specially handles exception
|
|
266 |
classes without useful string methods.
|
|
1185.33.7
by Martin Pool
Better formatting of builtin errors |
267 |
|
268 |
The result has no trailing newline.
|
|
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
269 |
|
270 |
exc_info - typically an exception from sys.exc_info()
|
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
271 |
"""
|
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
272 |
exc_type, exc_object, exc_tb = exc_info |
1185.33.17
by Martin Pool
[merge] aaron, various fixes |
273 |
try: |
274 |
if exc_type is None: |
|
275 |
return '(no exception)' |
|
1185.33.63
by Martin Pool
Better display of BzrError classes that are not BzrNewErrors. |
276 |
if isinstance(exc_object, (BzrError, BzrNewError)): |
1185.33.17
by Martin Pool
[merge] aaron, various fixes |
277 |
return str(exc_object) |
278 |
else: |
|
279 |
import traceback |
|
280 |
tb = traceback.extract_tb(exc_tb) |
|
281 |
msg = '%s: %s' % (exc_type, exc_object) |
|
282 |
if msg[-1] == '\n': |
|
283 |
msg = msg[:-1] |
|
284 |
if tb: |
|
285 |
msg += '\n at %s line %d\n in %s' % (tb[-1][:3]) |
|
286 |
return msg |
|
1185.33.63
by Martin Pool
Better display of BzrError classes that are not BzrNewErrors. |
287 |
except Exception, formatting_exc: |
288 |
# XXX: is this really better than just letting it run up?
|
|
289 |
return '(error formatting exception of type %s: %s)' \ |
|
290 |
% (exc_type, formatting_exc) |