5752.3.8
by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts |
1 |
# Copyright (C) 2005-2011 Canonical Ltd
|
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1
by mbp at sourcefrog
import from baz patch-364 |
16 |
|
4961.1.1
by Martin Pool
doc |
17 |
"""Messages and logging.
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
18 |
|
19 |
Messages are supplied by callers as a string-formatting template, plus values
|
|
20 |
to be inserted into it. The actual %-formatting is deferred to the log
|
|
21 |
library so that it doesn't need to be done for messages that won't be emitted.
|
|
22 |
||
23 |
Messages are classified by severity levels: critical, error, warning, info,
|
|
24 |
and debug.
|
|
25 |
||
26 |
They can be sent to two places: to stderr, and to ~/.bzr.log. For purposes
|
|
27 |
such as running the test suite, they can also be redirected away from both of
|
|
28 |
those two places to another location.
|
|
29 |
||
30 |
~/.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. |
31 |
This trace file is always in UTF-8, regardless of the user's default encoding,
|
32 |
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 |
33 |
|
34 |
Output to stderr depends on the mode chosen by the user. By default, messages
|
|
35 |
of info and above are sent out, which results in progress messages such as the
|
|
4961.1.1
by Martin Pool
doc |
36 |
list of files processed by add and commit. In debug mode, stderr gets debug messages too.
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
37 |
|
38 |
Errors that terminate an operation are generally passed back as exceptions;
|
|
39 |
others may be just emitted as messages.
|
|
40 |
||
41 |
Exceptions are reported in a brief form to stderr so as not to look scary.
|
|
42 |
BzrErrors are required to be able to format themselves into a properly
|
|
1759.2.1
by Jelmer Vernooij
Fix some types (found using aspell). |
43 |
explanatory message. This is not true for builtin exceptions such as
|
1185.33.6
by Martin Pool
Code and tests for shorter formatting of error messages |
44 |
KeyError, which typically just str to "0". They're printed in a different
|
45 |
form.
|
|
344
by Martin Pool
- It's not an error to use the library without |
46 |
"""
|
47 |
||
1185.16.74
by Martin Pool
doc |
48 |
# FIXME: Unfortunately it turns out that python's logging module
|
49 |
# is quite expensive, even when the message is not printed by any handlers.
|
|
50 |
# We should perhaps change back to just simply doing it here.
|
|
3173.1.6
by Martin Pool
Remove _stderr_handler global |
51 |
#
|
52 |
# On the other hand, as of 1.2 we generally only call the mutter() statement
|
|
53 |
# if (according to debug_flags) we actually intend to write it. So the
|
|
54 |
# increased cost of logging.py is not so bad, and we could standardize on
|
|
55 |
# that.
|
|
1185.16.74
by Martin Pool
doc |
56 |
|
2978.1.1
by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173) |
57 |
import codecs |
58 |
import logging |
|
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
59 |
import os |
1551.9.3
by Aaron Bentley
Revert buggy apport changes |
60 |
import sys |
3170.1.1
by Andrew Bennetts
Add -Dtimes, which adds a timestamp to mutters (using the time since the first mutter). |
61 |
import time |
1996.3.29
by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace |
62 |
|
63 |
from bzrlib.lazy_import import lazy_import |
|
64 |
lazy_import(globals(), """ |
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
65 |
from cStringIO import StringIO
|
1996.3.29
by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace |
66 |
import errno
|
2842.1.1
by Martin Pool
Report locale, encodings and plugins in traceback |
67 |
import locale
|
5753.2.2
by Jelmer Vernooij
Remove some unnecessary imports, clean up lazy imports. |
68 |
import tempfile
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
69 |
import traceback
|
1996.3.29
by John Arbash Meinel
don't import errors, and try to lazy import logging in bzrlib.trace |
70 |
""") |
1097
by Martin Pool
- send trace messages out through python logging module |
71 |
|
1185.33.8
by Martin Pool
Cleanup exception formatting stuff |
72 |
import bzrlib |
1097
by Martin Pool
- send trace messages out through python logging module |
73 |
|
4695.5.9
by Martin Pool
Restore info, log_error and error, as deprecated functions |
74 |
from bzrlib.symbol_versioning import ( |
75 |
deprecated_function, |
|
76 |
deprecated_in, |
|
77 |
)
|
|
78 |
||
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
79 |
lazy_import(globals(), """ |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
80 |
from bzrlib import (
|
81 |
debug,
|
|
82 |
errors,
|
|
2842.1.1
by Martin Pool
Report locale, encodings and plugins in traceback |
83 |
osutils,
|
4961.1.3
by Martin Pool
trace quietness now controls whether the progress bar appears |
84 |
ui,
|
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
85 |
)
|
2095.5.2
by Martin Pool
save commit message if commit fails (#32054) |
86 |
""") |
87 |
||
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
88 |
|
89 |
# global verbosity for bzrlib; controls the log level for stderr; 0=normal; <0
|
|
90 |
# is quiet; >0 is verbose.
|
|
2768.1.2
by Ian Clatworthy
Make noise levels a scale, not just a boolean in trace.py |
91 |
_verbosity_level = 0 |
3173.1.2
by Martin Pool
bzrlib.trace docs and cleanups |
92 |
|
93 |
# File-like object where mutter/debug output is currently sent. Can be
|
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
94 |
# changed by _push_log_file etc. This is directly manipulated by some
|
95 |
# external code; maybe there should be functions to do that more precisely
|
|
96 |
# than push/pop_log_file.
|
|
1185.43.7
by Martin Pool
Do debug messages not through python logging |
97 |
_trace_file = None |
3173.1.2
by Martin Pool
bzrlib.trace docs and cleanups |
98 |
|
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
99 |
# Absolute path for ~/.bzr.log. Not changed even if the log/trace output is
|
100 |
# redirected elsewhere. Used to show the location in --version.
|
|
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
101 |
_bzr_log_filename = None |
3173.1.2
by Martin Pool
bzrlib.trace docs and cleanups |
102 |
|
103 |
# The time the first message was written to the trace file, so that we can
|
|
104 |
# show relative times since startup.
|
|
3173.1.14
by Martin Pool
Merge trunk |
105 |
_bzr_log_start_time = bzrlib._start_time |
3173.1.2
by Martin Pool
bzrlib.trace docs and cleanups |
106 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
107 |
|
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
108 |
# held in a global for quick reference
|
1097
by Martin Pool
- send trace messages out through python logging module |
109 |
_bzr_logger = logging.getLogger('bzr') |
110 |
||
2978.1.1
by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173) |
111 |
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
112 |
def note(*args, **kwargs): |
5200.2.2
by Robert Collins
Document what note does a little. |
113 |
"""Output a note to the user.
|
114 |
||
115 |
Takes the same parameters as logging.info.
|
|
5200.2.4
by Robert Collins
Review feedback. |
116 |
|
5200.2.2
by Robert Collins
Document what note does a little. |
117 |
:return: None
|
118 |
"""
|
|
1793.2.16
by Aaron Bentley
More notes on 'note' |
119 |
# FIXME note always emits utf-8, regardless of the terminal encoding
|
3173.1.7
by Martin Pool
Rename push/pop_log_file, and deprecate enable/disable_test_log |
120 |
#
|
121 |
# FIXME: clearing the ui and then going through the abstract logging
|
|
122 |
# framework is whack; we should probably have a logging Handler that
|
|
123 |
# deals with terminal output if needed.
|
|
5582.10.6
by Jelmer Vernooij
Fix ui imports. |
124 |
ui.ui_factory.clear_term() |
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
125 |
_bzr_logger.info(*args, **kwargs) |
126 |
||
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
127 |
|
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
128 |
def warning(*args, **kwargs): |
5582.10.6
by Jelmer Vernooij
Fix ui imports. |
129 |
ui.ui_factory.clear_term() |
1558.8.1
by Aaron Bentley
Fix overall progress bar's interaction with 'note' and 'warning' |
130 |
_bzr_logger.warning(*args, **kwargs) |
131 |
||
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
132 |
|
4695.5.9
by Martin Pool
Restore info, log_error and error, as deprecated functions |
133 |
@deprecated_function(deprecated_in((2, 1, 0))) |
134 |
def info(*args, **kwargs): |
|
135 |
"""Deprecated: use trace.note instead."""
|
|
136 |
note(*args, **kwargs) |
|
137 |
||
138 |
||
139 |
@deprecated_function(deprecated_in((2, 1, 0))) |
|
140 |
def log_error(*args, **kwargs): |
|
141 |
"""Deprecated: use bzrlib.trace.show_error instead"""
|
|
142 |
_bzr_logger.error(*args, **kwargs) |
|
143 |
||
144 |
||
145 |
@deprecated_function(deprecated_in((2, 1, 0))) |
|
146 |
def error(*args, **kwargs): |
|
147 |
"""Deprecated: use bzrlib.trace.show_error instead"""
|
|
148 |
_bzr_logger.error(*args, **kwargs) |
|
149 |
||
150 |
||
5055.4.1
by Gordon Tyler
Fixed show_error args and added test for show_error. |
151 |
def show_error(*args, **kwargs): |
4695.5.9
by Martin Pool
Restore info, log_error and error, as deprecated functions |
152 |
"""Show an error message to the user.
|
153 |
||
154 |
Don't use this for exceptions, use report_exception instead.
|
|
155 |
"""
|
|
156 |
_bzr_logger.error(*args, **kwargs) |
|
157 |
||
158 |
||
1185.43.7
by Martin Pool
Do debug messages not through python logging |
159 |
def mutter(fmt, *args): |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
160 |
if _trace_file is None: |
161 |
return
|
|
4792.6.1
by Martin Pool
Avoid time-based flushing of trace file, it's line buffered anyhow |
162 |
# XXX: Don't check this every time; instead anyone who closes the file
|
163 |
# ought to deregister it. We can tolerate None.
|
|
1963.2.6
by Robey Pointer
pychecker is on crack; go back to using 'is None'. |
164 |
if (getattr(_trace_file, 'closed', None) is not None) and _trace_file.closed: |
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
165 |
return
|
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
166 |
|
167 |
if isinstance(fmt, unicode): |
|
168 |
fmt = fmt.encode('utf8') |
|
169 |
||
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
170 |
if len(args) > 0: |
1685.1.2
by John Arbash Meinel
Re-enabling the non_ascii tests after fixing trace.py, bzr ignore also does the right thing now |
171 |
# It seems that if we do ascii % (unicode, ascii) we can
|
172 |
# get a unicode cannot encode ascii error, so make sure that "fmt"
|
|
173 |
# is a unicode string
|
|
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
174 |
real_args = [] |
175 |
for arg in args: |
|
176 |
if isinstance(arg, unicode): |
|
177 |
arg = arg.encode('utf8') |
|
178 |
real_args.append(arg) |
|
179 |
out = fmt % tuple(real_args) |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
180 |
else: |
1185.33.51
by Martin Pool
Fix trace of non-ascii messages, and add test. |
181 |
out = fmt |
3928.2.1
by John Arbash Meinel
Update mutter() to flush occasionally. |
182 |
now = time.time() |
183 |
timestamp = '%0.3f ' % (now - _bzr_log_start_time,) |
|
3195.1.1
by Andrew Bennetts
Always include timestamps in the trace file (i.e. remove -Dtimes in favour of having it switched on permanently) |
184 |
out = timestamp + out + '\n' |
1948.1.9
by John Arbash Meinel
Change mutter() so that it doesn't try so hard to write out perfect utf8, instead, rather than using a utf8 file, it changes unicode to utf8 manually |
185 |
_trace_file.write(out) |
4792.6.1
by Martin Pool
Avoid time-based flushing of trace file, it's line buffered anyhow |
186 |
# there's no explicit flushing; the file is typically line buffered.
|
1097
by Martin Pool
- send trace messages out through python logging module |
187 |
|
1185.43.10
by Martin Pool
Remove need for BZR_DEBUG to get debug info in trace file. |
188 |
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
189 |
def mutter_callsite(stacklevel, fmt, *args): |
190 |
"""Perform a mutter of fmt and args, logging the call trace.
|
|
191 |
||
192 |
:param stacklevel: The number of frames to show. None will show all
|
|
193 |
frames.
|
|
194 |
:param fmt: The format string to pass to mutter.
|
|
195 |
:param args: A list of substitution variables.
|
|
196 |
"""
|
|
197 |
outf = StringIO() |
|
3441.5.1
by Andrew Bennetts
Avoid necessarily calling get_parent_map when pushing. |
198 |
if stacklevel is None: |
199 |
limit = None |
|
200 |
else: |
|
201 |
limit = stacklevel + 1 |
|
202 |
traceback.print_stack(limit=limit, file=outf) |
|
2725.1.1
by Robert Collins
Add -Devil flag to highlight the use of problematic API calls. |
203 |
formatted_lines = outf.getvalue().splitlines() |
204 |
formatted_stack = '\n'.join(formatted_lines[:-2]) |
|
205 |
mutter(fmt + "\nCalled from:\n%s", *(args + (formatted_stack,))) |
|
206 |
||
207 |
||
261
by Martin Pool
- auto-rollover of .bzr.log |
208 |
def _rollover_trace_maybe(trace_fname): |
359
by Martin Pool
- pychecker fixups |
209 |
import stat |
261
by Martin Pool
- auto-rollover of .bzr.log |
210 |
try: |
211 |
size = os.stat(trace_fname)[stat.ST_SIZE] |
|
333
by Martin Pool
- allow trace file to grow up to 4MB |
212 |
if size <= 4 << 20: |
261
by Martin Pool
- auto-rollover of .bzr.log |
213 |
return
|
214 |
old_fname = trace_fname + '.old' |
|
2851.3.1
by Martin Pool
Add unit test for _rollover_trace_maybe |
215 |
osutils.rename(trace_fname, old_fname) |
261
by Martin Pool
- auto-rollover of .bzr.log |
216 |
except OSError: |
217 |
return
|
|
218 |
||
219 |
||
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
220 |
def _get_bzr_log_filename(): |
3193.6.8
by Alexander Belchenko
merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins) |
221 |
bzr_log = os.environ.get('BZR_LOG') |
222 |
if bzr_log: |
|
223 |
return bzr_log |
|
224 |
home = os.environ.get('BZR_HOME') |
|
225 |
if home is None: |
|
226 |
if sys.platform == 'win32': |
|
227 |
from bzrlib import win32utils |
|
228 |
home = win32utils.get_home_location() |
|
229 |
else: |
|
230 |
home = os.path.expanduser('~') |
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
231 |
return os.path.join(home, '.bzr.log') |
232 |
||
233 |
||
234 |
def _open_bzr_log(): |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
235 |
"""Open the .bzr.log trace file.
|
3173.1.2
by Martin Pool
bzrlib.trace docs and cleanups |
236 |
|
237 |
If the log is more than a particular length, the old file is renamed to
|
|
238 |
.bzr.log.old and a new file is started. Otherwise, we append to the
|
|
239 |
existing file.
|
|
240 |
||
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
241 |
This sets the global _bzr_log_filename.
|
3173.1.2
by Martin Pool
bzrlib.trace docs and cleanups |
242 |
"""
|
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
243 |
global _bzr_log_filename |
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
244 |
|
5116.3.1
by Martin
Rearrange log opening helper function and fix a couple of bugs |
245 |
def _open_or_create_log_file(filename): |
246 |
"""Open existing log file, or create with ownership and permissions
|
|
5116.2.6
by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path. |
247 |
|
248 |
It inherits the ownership and permissions (masked by umask) from
|
|
249 |
the containing directory to cope better with being run under sudo
|
|
250 |
with $HOME still set to the user's homedir.
|
|
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
251 |
"""
|
5116.2.6
by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path. |
252 |
flags = os.O_WRONLY | os.O_APPEND | osutils.O_TEXT |
5116.2.5
by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation |
253 |
while True: |
254 |
try: |
|
5116.2.6
by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path. |
255 |
fd = os.open(filename, flags) |
5116.3.1
by Martin
Rearrange log opening helper function and fix a couple of bugs |
256 |
break
|
5116.2.5
by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation |
257 |
except OSError, e: |
258 |
if e.errno != errno.ENOENT: |
|
259 |
raise
|
|
260 |
try: |
|
5116.3.1
by Martin
Rearrange log opening helper function and fix a couple of bugs |
261 |
fd = os.open(filename, flags | os.O_CREAT | os.O_EXCL, 0666) |
5116.2.5
by Parth Malwankar
added 'while True:' so multiple process can spin on log file creation |
262 |
except OSError, e: |
263 |
if e.errno != errno.EEXIST: |
|
264 |
raise
|
|
265 |
else: |
|
5116.2.6
by Parth Malwankar
renamed copy_ownership to copy_ownership_from_path. |
266 |
osutils.copy_ownership_from_path(filename) |
5116.3.1
by Martin
Rearrange log opening helper function and fix a couple of bugs |
267 |
break
|
268 |
return os.fdopen(fd, 'at', 0) # unbuffered |
|
5116.2.3
by Parth Malwankar
updated log file creation to avoid race based on implementation by Martin [gz] |
269 |
|
270 |
||
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
271 |
_bzr_log_filename = _get_bzr_log_filename() |
2566.1.1
by Martin Pool
Show bzr.log location in bzr --version output. |
272 |
_rollover_trace_maybe(_bzr_log_filename) |
403
by Martin Pool
- Don't give an error if the trace file can't be opened |
273 |
try: |
5116.3.1
by Martin
Rearrange log opening helper function and fix a couple of bugs |
274 |
bzr_log_file = _open_or_create_log_file(_bzr_log_filename) |
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
275 |
bzr_log_file.write('\n') |
276 |
if bzr_log_file.tell() <= 2: |
|
277 |
bzr_log_file.write("this is a debug log for diagnosing/reporting problems in bzr\n") |
|
278 |
bzr_log_file.write("you can delete or truncate this file, or include sections in\n") |
|
279 |
bzr_log_file.write("bug reports to https://bugs.launchpad.net/bzr/+filebug\n\n") |
|
4634.143.2
by Parth Malwankar
fixed test cases to handle special .bzr.log files |
280 |
|
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
281 |
return bzr_log_file |
4634.143.4
by Parth Malwankar
added parent_dir and mkdir to osutils. osutils.mkdir optionally |
282 |
|
5116.3.1
by Martin
Rearrange log opening helper function and fix a couple of bugs |
283 |
except EnvironmentError, e: |
4634.118.1
by John Arbash Meinel
Fix bug #503886, errors setting up logging go to stderr. |
284 |
# If we are failing to open the log, then most likely logging has not
|
285 |
# been set up yet. So we just write to stderr rather than using
|
|
286 |
# 'warning()'. If we using warning(), users get the unhelpful 'no
|
|
287 |
# handlers registered for "bzr"' when something goes wrong on the
|
|
288 |
# server. (bug #503886)
|
|
289 |
sys.stderr.write("failed to open trace file: %s\n" % (e,)) |
|
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
290 |
# TODO: What should happen if we fail to open the trace file? Maybe the
|
291 |
# objects should be pointed at /dev/null or the equivalent? Currently
|
|
292 |
# returns None which will cause failures later.
|
|
3805.2.4
by John Arbash Meinel
Handle when _open_bzr_log returns None. |
293 |
return None |
260
by Martin Pool
- remove atexit() dependency for writing out execution times |
294 |
|
1097
by Martin Pool
- send trace messages out through python logging module |
295 |
|
1111
by Martin Pool
- add functions to enable and disable default logging, so that we can |
296 |
def enable_default_logging(): |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
297 |
"""Configure default logging: messages to stderr and debug to .bzr.log
|
3805.2.1
by John Arbash Meinel
Update trace to log when the process started. |
298 |
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
299 |
This should only be called once per process.
|
3173.1.6
by Martin Pool
Remove _stderr_handler global |
300 |
|
301 |
Non-command-line programs embedding bzrlib do not need to call this. They
|
|
302 |
can instead either pass a file to _push_log_file, or act directly on
|
|
303 |
logging.getLogger("bzr").
|
|
3805.2.1
by John Arbash Meinel
Update trace to log when the process started. |
304 |
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
305 |
Output can be redirected away by calling _push_log_file.
|
5320.2.5
by Robert Collins
Make bzrlib startup use a trace context manager. |
306 |
|
307 |
:return: A memento from push_log_file for restoring the log state.
|
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
308 |
"""
|
3805.2.3
by John Arbash Meinel
Use osutils.format_local_date() instead of time.strftime() |
309 |
start_time = osutils.format_local_date(_bzr_log_start_time, |
310 |
timezone='local') |
|
2978.1.1
by Alexander Belchenko
Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173) |
311 |
# create encoded wrapper around stderr
|
3173.1.5
by Martin Pool
Remove global _bzr_log_file |
312 |
bzr_log_file = _open_bzr_log() |
3805.2.4
by John Arbash Meinel
Handle when _open_bzr_log returns None. |
313 |
if bzr_log_file is not None: |
314 |
bzr_log_file.write(start_time.encode('utf-8') + '\n') |
|
5320.2.5
by Robert Collins
Make bzrlib startup use a trace context manager. |
315 |
memento = push_log_file(bzr_log_file, |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
316 |
r'[%(process)5d] %(asctime)s.%(msecs)03d %(levelname)s: %(message)s', |
317 |
r'%Y-%m-%d %H:%M:%S') |
|
318 |
# after hooking output into bzr_log, we also need to attach a stderr
|
|
3173.1.6
by Martin Pool
Remove _stderr_handler global |
319 |
# handler, writing only at level info and with encoding
|
5320.2.4
by Robert Collins
``bzrlib.osutils.get_terminal_encoding`` will now only mutter its |
320 |
term_encoding = osutils.get_terminal_encoding() |
3805.2.1
by John Arbash Meinel
Update trace to log when the process started. |
321 |
writer_factory = codecs.getwriter(term_encoding) |
3173.1.6
by Martin Pool
Remove _stderr_handler global |
322 |
encoded_stderr = writer_factory(sys.stderr, errors='replace') |
323 |
stderr_handler = logging.StreamHandler(encoded_stderr) |
|
324 |
stderr_handler.setLevel(logging.INFO) |
|
325 |
logging.getLogger('bzr').addHandler(stderr_handler) |
|
5320.2.5
by Robert Collins
Make bzrlib startup use a trace context manager. |
326 |
return memento |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
327 |
|
328 |
||
3173.1.7
by Martin Pool
Rename push/pop_log_file, and deprecate enable/disable_test_log |
329 |
def push_log_file(to_file, log_format=None, date_format=None): |
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
330 |
"""Intercept log and trace messages and send them to a file.
|
331 |
||
3173.1.11
by Martin Pool
Fix up renaming of push_log_file |
332 |
:param to_file: A file-like object to which messages will be sent.
|
333 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
334 |
:returns: A memento that should be passed to _pop_log_file to restore the
|
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
335 |
previously active logging.
|
336 |
"""
|
|
337 |
global _trace_file |
|
338 |
# make a new handler
|
|
339 |
new_handler = logging.StreamHandler(to_file) |
|
340 |
new_handler.setLevel(logging.DEBUG) |
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
341 |
if log_format is None: |
342 |
log_format = '%(levelname)8s %(message)s' |
|
343 |
new_handler.setFormatter(logging.Formatter(log_format, date_format)) |
|
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
344 |
# save and remove any existing log handlers
|
345 |
bzr_logger = logging.getLogger('bzr') |
|
346 |
old_handlers = bzr_logger.handlers[:] |
|
347 |
del bzr_logger.handlers[:] |
|
348 |
# set that as the default logger
|
|
349 |
bzr_logger.addHandler(new_handler) |
|
350 |
bzr_logger.setLevel(logging.DEBUG) |
|
351 |
# TODO: check if any changes are needed to the root logger
|
|
352 |
#
|
|
353 |
# TODO: also probably need to save and restore the level on bzr_logger.
|
|
354 |
# but maybe we can avoid setting the logger level altogether, and just set
|
|
355 |
# the level on the handler?
|
|
356 |
#
|
|
357 |
# save the old trace file
|
|
358 |
old_trace_file = _trace_file |
|
359 |
# send traces to the new one
|
|
360 |
_trace_file = to_file |
|
361 |
result = new_handler, _trace_file |
|
362 |
return ('log_memento', old_handlers, new_handler, old_trace_file, to_file) |
|
363 |
||
364 |
||
3173.1.7
by Martin Pool
Rename push/pop_log_file, and deprecate enable/disable_test_log |
365 |
def pop_log_file((magic, old_handlers, new_handler, old_trace_file, new_trace_file)): |
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
366 |
"""Undo changes to logging/tracing done by _push_log_file.
|
367 |
||
5320.2.7
by Robert Collins
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding. |
368 |
This flushes, but does not close the trace file (so that anything that was
|
369 |
in it is output.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
370 |
|
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
371 |
Takes the memento returned from _push_log_file."""
|
372 |
global _trace_file |
|
373 |
_trace_file = old_trace_file |
|
374 |
bzr_logger = logging.getLogger('bzr') |
|
375 |
bzr_logger.removeHandler(new_handler) |
|
5222.2.7
by Robert Collins
Document bzrlib.initialize a little better, and explicitly propogate exceptions in the new __exit__ methods. |
376 |
# must be closed, otherwise logging will try to close it at exit, and the
|
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
377 |
# file will likely already be closed underneath.
|
378 |
new_handler.close() |
|
379 |
bzr_logger.handlers = old_handlers |
|
5320.2.7
by Robert Collins
Sanity check that new_trace_file in pop_log_file is valid, and also fix a test that monkey patched get_terminal_encoding. |
380 |
if new_trace_file is not None: |
381 |
new_trace_file.flush() |
|
3173.1.1
by Martin Pool
New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153 |
382 |
|
383 |
||
3427.2.2
by James Westby
Just print the exception, keeping the API of log_exception_quietly the same. |
384 |
def log_exception_quietly(): |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
385 |
"""Log the last exception to the trace file only.
|
386 |
||
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
387 |
Used for exceptions that occur internally and that may be
|
388 |
interesting to developers but not to users. For example,
|
|
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
389 |
errors loading plugins.
|
390 |
"""
|
|
3427.2.2
by James Westby
Just print the exception, keeping the API of log_exception_quietly the same. |
391 |
mutter(traceback.format_exc()) |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
392 |
|
393 |
||
394 |
def set_verbosity_level(level): |
|
395 |
"""Set the verbosity level.
|
|
396 |
||
397 |
:param level: -ve for quiet, 0 for normal, +ve for verbose
|
|
398 |
"""
|
|
399 |
global _verbosity_level |
|
400 |
_verbosity_level = level |
|
401 |
_update_logging_level(level < 0) |
|
4961.1.3
by Martin Pool
trace quietness now controls whether the progress bar appears |
402 |
ui.ui_factory.be_quiet(level < 0) |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
403 |
|
404 |
||
405 |
def get_verbosity_level(): |
|
406 |
"""Get the verbosity level.
|
|
407 |
||
408 |
See set_verbosity_level() for values.
|
|
409 |
"""
|
|
410 |
return _verbosity_level |
|
411 |
||
412 |
||
413 |
def be_quiet(quiet=True): |
|
414 |
if quiet: |
|
415 |
set_verbosity_level(-1) |
|
416 |
else: |
|
417 |
set_verbosity_level(0) |
|
418 |
||
419 |
||
420 |
def _update_logging_level(quiet=True): |
|
421 |
"""Hide INFO messages if quiet."""
|
|
422 |
if quiet: |
|
3173.1.6
by Martin Pool
Remove _stderr_handler global |
423 |
_bzr_logger.setLevel(logging.WARNING) |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
424 |
else: |
3173.1.6
by Martin Pool
Remove _stderr_handler global |
425 |
_bzr_logger.setLevel(logging.INFO) |
3173.1.4
by Martin Pool
Rearrange and clean up bzr trace/logging |
426 |
|
427 |
||
428 |
def is_quiet(): |
|
429 |
"""Is the verbosity level negative?"""
|
|
430 |
return _verbosity_level < 0 |
|
431 |
||
432 |
||
433 |
def is_verbose(): |
|
434 |
"""Is the verbosity level positive?"""
|
|
435 |
return _verbosity_level > 0 |
|
436 |
||
437 |
||
3698.1.2
by John Arbash Meinel
Make message optional, don't check the memory flag directly. |
438 |
def debug_memory(message='', short=True): |
3698.1.1
by John Arbash Meinel
Move the memory debugging into a helper function. |
439 |
"""Write out a memory dump."""
|
4011.1.1
by John Arbash Meinel
Implement -Dmemory for win32 |
440 |
if sys.platform == 'win32': |
441 |
from bzrlib import win32utils |
|
442 |
win32utils.debug_memory_win32api(message=message, short=short) |
|
443 |
else: |
|
444 |
_debug_memory_proc(message=message, short=short) |
|
445 |
||
446 |
||
447 |
_short_fields = ('VmPeak', 'VmSize', 'VmRSS') |
|
448 |
||
449 |
def _debug_memory_proc(message='', short=True): |
|
3698.1.1
by John Arbash Meinel
Move the memory debugging into a helper function. |
450 |
try: |
451 |
status_file = file('/proc/%s/status' % os.getpid(), 'rb') |
|
452 |
except IOError: |
|
453 |
return
|
|
454 |
try: |
|
455 |
status = status_file.read() |
|
456 |
finally: |
|
457 |
status_file.close() |
|
3698.1.2
by John Arbash Meinel
Make message optional, don't check the memory flag directly. |
458 |
if message: |
459 |
note(message) |
|
3698.1.1
by John Arbash Meinel
Move the memory debugging into a helper function. |
460 |
for line in status.splitlines(): |
461 |
if not short: |
|
462 |
note(line) |
|
463 |
else: |
|
464 |
for field in _short_fields: |
|
465 |
if line.startswith(field): |
|
466 |
note(line) |
|
467 |
break
|
|
468 |
||
5448.5.2
by Karl Bielefeldt
Incorporated suggestions from code review: |
469 |
def _dump_memory_usage(err_file): |
5448.5.1
by Karl Bielefeldt
Use meliae to dump memory to a file upon MemoryError. |
470 |
try: |
5448.5.4
by Karl Bielefeldt
Fix Python 2.4 incompatibilities |
471 |
try: |
472 |
fd, name = tempfile.mkstemp(prefix="bzr_memdump", suffix=".json") |
|
473 |
dump_file = os.fdopen(fd, 'w') |
|
474 |
from meliae import scanner |
|
475 |
scanner.dump_gc_objects(dump_file) |
|
476 |
err_file.write("Memory dumped to %s\n" % name) |
|
477 |
except ImportError: |
|
478 |
err_file.write("Dumping memory requires meliae module.\n") |
|
479 |
log_exception_quietly() |
|
480 |
except: |
|
481 |
err_file.write("Exception while dumping memory.\n") |
|
482 |
log_exception_quietly() |
|
5448.5.2
by Karl Bielefeldt
Incorporated suggestions from code review: |
483 |
finally: |
5448.5.4
by Karl Bielefeldt
Fix Python 2.4 incompatibilities |
484 |
if dump_file is not None: |
485 |
dump_file.close() |
|
486 |
elif fd is not None: |
|
487 |
os.close(fd) |
|
3698.1.1
by John Arbash Meinel
Move the memory debugging into a helper function. |
488 |
|
5677.3.1
by Martin
Add helper for getting qualified exception name to bzrlib.trace |
489 |
|
490 |
def _qualified_exception_name(eclass, unqualified_bzrlib_errors=False): |
|
491 |
"""Give name of error class including module for non-builtin exceptions
|
|
492 |
||
493 |
If `unqualified_bzrlib_errors` is True, errors specific to bzrlib will
|
|
494 |
also omit the module prefix.
|
|
495 |
"""
|
|
496 |
class_name = eclass.__name__ |
|
497 |
module_name = eclass.__module__ |
|
5677.2.10
by Martin
Omit '__main__' from exception names as well now they're purely decorative |
498 |
if module_name in ("exceptions", "__main__") or ( |
5677.3.1
by Martin
Add helper for getting qualified exception name to bzrlib.trace |
499 |
unqualified_bzrlib_errors and module_name == "bzrlib.errors"): |
500 |
return class_name |
|
501 |
return "%s.%s" % (module_name, class_name) |
|
502 |
||
503 |
||
1740.5.2
by Martin Pool
Improved tests for display of exceptions. |
504 |
def report_exception(exc_info, err_file): |
2830.2.1
by Martin Pool
If TestCase.run_bzr hits an internal exception, don't catch it but rather propagate up into the test suite |
505 |
"""Report an exception to err_file (typically stderr) and to .bzr.log.
|
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
506 |
|
507 |
This will show either a full traceback or a short message as appropriate.
|
|
508 |
||
509 |
:return: The appropriate exit code for this error.
|
|
510 |
"""
|
|
4805.3.2
by Benoît Pierre
Always log the full traceback to ~/.bzr.log, even when -Derror is used. |
511 |
# Log the full traceback to ~/.bzr.log
|
512 |
log_exception_quietly() |
|
4805.3.1
by Benoît Pierre
Always honor 'error' debug flag. |
513 |
if 'error' in debug.debug_flags: |
514 |
print_exception(exc_info, err_file) |
|
515 |
return errors.EXIT_ERROR |
|
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
516 |
exc_type, exc_object, exc_tb = exc_info |
517 |
if (isinstance(exc_object, IOError) |
|
518 |
and getattr(exc_object, 'errno', None) == errno.EPIPE): |
|
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
519 |
err_file.write("bzr: broken pipe\n") |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
520 |
return errors.EXIT_ERROR |
1740.5.3
by Martin Pool
Cleanup more exception-formatting code |
521 |
elif isinstance(exc_object, KeyboardInterrupt): |
2911.6.1
by Blake Winton
Change 'print >> f,'s to 'f.write('s. |
522 |
err_file.write("bzr: interrupted\n") |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
523 |
return errors.EXIT_ERROR |
4634.26.1
by Martin Pool
Cleaner message when out of memory |
524 |
elif isinstance(exc_object, MemoryError): |
525 |
err_file.write("bzr: out of memory\n") |
|
5448.5.2
by Karl Bielefeldt
Incorporated suggestions from code review: |
526 |
if 'mem_dump' in debug.debug_flags: |
527 |
_dump_memory_usage(err_file) |
|
528 |
else: |
|
529 |
err_file.write("Use -Dmem_dump to dump memory to a file.\n") |
|
4634.26.1
by Martin Pool
Cleaner message when out of memory |
530 |
return errors.EXIT_ERROR |
3497.3.2
by Martin Pool
Show short error for missing libraries |
531 |
elif isinstance(exc_object, ImportError) \ |
532 |
and str(exc_object).startswith("No module named "): |
|
533 |
report_user_error(exc_info, err_file, |
|
534 |
'You may need to install this Python library separately.') |
|
535 |
return errors.EXIT_ERROR |
|
2067.3.2
by Martin Pool
Error cleanup review comments: |
536 |
elif not getattr(exc_object, 'internal_error', True): |
1740.5.6
by Martin Pool
Clean up many exception classes. |
537 |
report_user_error(exc_info, err_file) |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
538 |
return errors.EXIT_ERROR |
5200.4.2
by Martin
Treat pywintypes.error as a user error as per OSError, rather than an internal error |
539 |
elif isinstance(exc_object, (OSError, IOError)) or ( |
5200.4.4
by Martin
Add comment explaining odd spelling of exception type check |
540 |
# GZ 2010-05-20: Like (exc_type is pywintypes.error) but avoid import
|
5200.4.2
by Martin
Treat pywintypes.error as a user error as per OSError, rather than an internal error |
541 |
exc_type.__name__ == "error" and exc_type.__module__ == "pywintypes"): |
1740.5.6
by Martin Pool
Clean up many exception classes. |
542 |
# Might be nice to catch all of these and show them as something more
|
543 |
# specific, but there are too many cases at the moment.
|
|
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
544 |
report_user_error(exc_info, err_file) |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
545 |
return errors.EXIT_ERROR |
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
546 |
else: |
1551.9.3
by Aaron Bentley
Revert buggy apport changes |
547 |
report_bug(exc_info, err_file) |
2713.2.1
by Martin Pool
Return exitcode 4 if an internal error occurs |
548 |
return errors.EXIT_INTERNAL_ERROR |
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
549 |
|
550 |
||
3427.2.2
by James Westby
Just print the exception, keeping the API of log_exception_quietly the same. |
551 |
def print_exception(exc_info, err_file): |
552 |
exc_type, exc_object, exc_tb = exc_info |
|
553 |
err_file.write("bzr: ERROR: %s.%s: %s\n" % ( |
|
554 |
exc_type.__module__, exc_type.__name__, exc_object)) |
|
555 |
err_file.write('\n') |
|
556 |
traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file) |
|
557 |
||
558 |
||
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
559 |
# TODO: Should these be specially encoding the output?
|
3497.3.2
by Martin Pool
Show short error for missing libraries |
560 |
def report_user_error(exc_info, err_file, advice=None): |
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
561 |
"""Report to err_file an error that's not an internal error.
|
562 |
||
563 |
These don't get a traceback unless -Derror was given.
|
|
3497.3.2
by Martin Pool
Show short error for missing libraries |
564 |
|
565 |
:param exc_info: 3-tuple from sys.exc_info()
|
|
566 |
:param advice: Extra advice to the user to be printed following the
|
|
567 |
exception.
|
|
2095.5.1
by Martin Pool
Add new -Derror global option to always display tracebacks |
568 |
"""
|
2911.6.3
by Blake Winton
Implemented suggestions from John Arbash Meinel. |
569 |
err_file.write("bzr: ERROR: %s\n" % (exc_info[1],)) |
3497.3.2
by Martin Pool
Show short error for missing libraries |
570 |
if advice: |
571 |
err_file.write("%s\n" % (advice,)) |
|
1740.5.1
by Martin Pool
When an unhandled exception occurs, write the traceback to stderr. |
572 |
|
573 |
||
574 |
def report_bug(exc_info, err_file): |
|
1740.5.2
by Martin Pool
Improved tests for display of exceptions. |
575 |
"""Report an exception that probably indicates a bug in bzr"""
|
4584.3.6
by Martin Pool
Move apport integration to bzrlib.crash and send output to a file. |
576 |
from bzrlib.crash import report_bug |
577 |
report_bug(exc_info, err_file) |
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
578 |
|
579 |
||
580 |
def _flush_stdout_stderr(): |
|
5222.2.3
by Robert Collins
Fix comments up in trace.py. |
581 |
# called from the bzrlib library finalizer returned by bzrlib.initialize()
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
582 |
try: |
583 |
sys.stdout.flush() |
|
584 |
sys.stderr.flush() |
|
585 |
except IOError, e: |
|
586 |
import errno |
|
587 |
if e.errno in [errno.EINVAL, errno.EPIPE]: |
|
588 |
pass
|
|
589 |
else: |
|
590 |
raise
|
|
591 |
||
592 |
||
593 |
def _flush_trace(): |
|
5222.2.3
by Robert Collins
Fix comments up in trace.py. |
594 |
# called from the bzrlib library finalizer returned by bzrlib.initialize()
|
5017.1.1
by Martin Pool
Add bzrlib.initialize |
595 |
global _trace_file |
596 |
if _trace_file: |
|
597 |
_trace_file.flush() |
|
5320.2.5
by Robert Collins
Make bzrlib startup use a trace context manager. |
598 |
|
599 |
||
600 |
class Config(object): |
|
601 |
"""Configuration of message tracing in bzrlib.
|
|
602 |
||
603 |
This implements the context manager protocol and should manage any global
|
|
604 |
variables still used. The default config used is DefaultConfig, but
|
|
605 |
embedded uses of bzrlib may wish to use a custom manager.
|
|
606 |
"""
|
|
607 |
||
608 |
def __enter__(self): |
|
609 |
return self # This is bound to the 'as' clause in a with statement. |
|
610 |
||
611 |
def __exit__(self, exc_type, exc_val, exc_tb): |
|
612 |
return False # propogate exceptions. |
|
613 |
||
614 |
||
615 |
class DefaultConfig(Config): |
|
616 |
"""A default configuration for tracing of messages in bzrlib.
|
|
617 |
||
618 |
This implements the context manager protocol.
|
|
619 |
"""
|
|
620 |
||
621 |
def __enter__(self): |
|
622 |
self._original_filename = _bzr_log_filename |
|
623 |
self._original_state = enable_default_logging() |
|
624 |
return self # This is bound to the 'as' clause in a with statement. |
|
625 |
||
626 |
def __exit__(self, exc_type, exc_val, exc_tb): |
|
627 |
pop_log_file(self._original_state) |
|
628 |
global _bzr_log_filename |
|
629 |
_bzr_log_filename = self._original_filename |
|
630 |
return False # propogate exceptions. |