bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
3173.1.3
by Martin Pool
 Deprecate disable_default_logging and add 1.2 deprecation marker  | 
1  | 
# Copyright (C) 2005, 2006, 2007, 2008 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  | 
|
| 
1185.33.6
by Martin Pool
 Code and tests for shorter formatting of error messages  | 
17  | 
"""Messages and logging for bazaar-ng.
 | 
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
 | 
|
36  | 
list of files processed by add and commit.  In quiet mode, only warnings and
 | 
|
37  | 
above are shown.  In debug mode, stderr gets debug messages too.
 | 
|
38  | 
||
39  | 
Errors that terminate an operation are generally passed back as exceptions;
 | 
|
40  | 
others may be just emitted as messages.
 | 
|
41  | 
||
42  | 
Exceptions are reported in a brief form to stderr so as not to look scary.
 | 
|
43  | 
BzrErrors are required to be able to format themselves into a properly
 | 
|
| 
1759.2.1
by Jelmer Vernooij
 Fix some types (found using aspell).  | 
44  | 
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  | 
45  | 
KeyError, which typically just str to "0".  They're printed in a different
 | 
46  | 
form.
 | 
|
| 
344
by Martin Pool
 - It's not an error to use the library without  | 
47  | 
"""
 | 
48  | 
||
| 
1185.16.74
by Martin Pool
 doc  | 
49  | 
# FIXME: Unfortunately it turns out that python's logging module
 | 
50  | 
# is quite expensive, even when the message is not printed by any handlers.
 | 
|
51  | 
# We should perhaps change back to just simply doing it here.
 | 
|
| 
3173.1.6
by Martin Pool
 Remove _stderr_handler global  | 
52  | 
#
 | 
53  | 
# On the other hand, as of 1.2 we generally only call the mutter() statement
 | 
|
54  | 
# if (according to debug_flags) we actually intend to write it.  So the
 | 
|
55  | 
# increased cost of logging.py is not so bad, and we could standardize on
 | 
|
56  | 
# that.
 | 
|
| 
1185.16.74
by Martin Pool
 doc  | 
57  | 
|
| 
2978.1.1
by Alexander Belchenko
 Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173)  | 
58  | 
import codecs  | 
59  | 
import logging  | 
|
| 
1740.5.3
by Martin Pool
 Cleanup more exception-formatting code  | 
60  | 
import os  | 
| 
1551.9.3
by Aaron Bentley
 Revert buggy apport changes  | 
61  | 
import sys  | 
| 
2123.1.1
by Robert Collins
 (Robert Collins) Extend the problem reporting command line UI to use  | 
62  | 
import re  | 
| 
3170.1.1
by Andrew Bennetts
 Add -Dtimes, which adds a timestamp to mutters (using the time since the first mutter).  | 
63  | 
import time  | 
| 
1996.3.29
by John Arbash Meinel
 don't import errors, and try to lazy import logging in bzrlib.trace  | 
64  | 
|
65  | 
from bzrlib.lazy_import import lazy_import  | 
|
66  | 
lazy_import(globals(), """  | 
|
| 
2725.1.1
by Robert Collins
 Add -Devil flag to highlight the use of problematic API calls.  | 
67  | 
from cStringIO import StringIO
 | 
| 
1996.3.29
by John Arbash Meinel
 don't import errors, and try to lazy import logging in bzrlib.trace  | 
68  | 
import errno
 | 
| 
2842.1.1
by Martin Pool
 Report locale, encodings and plugins in traceback  | 
69  | 
import locale
 | 
| 
2725.1.1
by Robert Collins
 Add -Devil flag to highlight the use of problematic API calls.  | 
70  | 
import traceback
 | 
| 
1996.3.29
by John Arbash Meinel
 don't import errors, and try to lazy import logging in bzrlib.trace  | 
71  | 
""")  | 
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
72  | 
|
| 
1185.33.8
by Martin Pool
 Cleanup exception formatting stuff  | 
73  | 
import bzrlib  | 
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
74  | 
|
| 
2095.5.2
by Martin Pool
 save commit message if commit fails (#32054)  | 
75  | 
lazy_import(globals(), """  | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
76  | 
from bzrlib import (
 | 
77  | 
    debug,
 | 
|
78  | 
    errors,
 | 
|
| 
2842.1.1
by Martin Pool
 Report locale, encodings and plugins in traceback  | 
79  | 
    osutils,
 | 
80  | 
    plugin,
 | 
|
| 
3173.1.3
by Martin Pool
 Deprecate disable_default_logging and add 1.2 deprecation marker  | 
81  | 
    symbol_versioning,
 | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
82  | 
    )
 | 
| 
2095.5.2
by Martin Pool
 save commit message if commit fails (#32054)  | 
83  | 
""")  | 
84  | 
||
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
85  | 
|
86  | 
# global verbosity for bzrlib; controls the log level for stderr; 0=normal; <0
 | 
|
87  | 
# is quiet; >0 is verbose.
 | 
|
| 
2768.1.2
by Ian Clatworthy
 Make noise levels a scale, not just a boolean in trace.py  | 
88  | 
_verbosity_level = 0  | 
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
89  | 
|
90  | 
# 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  | 
91  | 
# changed by _push_log_file etc.  This is directly manipulated by some
 | 
92  | 
# external code; maybe there should be functions to do that more precisely
 | 
|
93  | 
# than push/pop_log_file.
 | 
|
| 
1185.43.7
by Martin Pool
 Do debug messages not through python logging  | 
94  | 
_trace_file = None  | 
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
95  | 
|
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
96  | 
# Absolute path for ~/.bzr.log.  Not changed even if the log/trace output is
 | 
97  | 
# redirected elsewhere.  Used to show the location in --version.
 | 
|
| 
2566.1.1
by Martin Pool
 Show bzr.log location in bzr --version output.  | 
98  | 
_bzr_log_filename = None  | 
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
99  | 
|
100  | 
# The time the first message was written to the trace file, so that we can
 | 
|
101  | 
# show relative times since startup.
 | 
|
| 
3173.1.14
by Martin Pool
 Merge trunk  | 
102  | 
_bzr_log_start_time = bzrlib._start_time  | 
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
103  | 
|
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
104  | 
|
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
105  | 
# held in a global for quick reference
 | 
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
106  | 
_bzr_logger = logging.getLogger('bzr')  | 
107  | 
||
| 
2978.1.1
by Alexander Belchenko
 Output to stderr with trace module now going through wrapper that takes care about terminal encoding. (#54173)  | 
108  | 
|
| 
1558.8.1
by Aaron Bentley
 Fix overall progress bar's interaction with 'note' and 'warning'  | 
109  | 
def note(*args, **kwargs):  | 
| 
1793.2.16
by Aaron Bentley
 More notes on 'note'  | 
110  | 
    # 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  | 
111  | 
    #
 | 
112  | 
    # FIXME: clearing the ui and then going through the abstract logging
 | 
|
113  | 
    # framework is whack; we should probably have a logging Handler that
 | 
|
114  | 
    # deals with terminal output if needed.
 | 
|
| 
1558.8.1
by Aaron Bentley
 Fix overall progress bar's interaction with 'note' and 'warning'  | 
115  | 
import bzrlib.ui  | 
116  | 
bzrlib.ui.ui_factory.clear_term()  | 
|
117  | 
_bzr_logger.info(*args, **kwargs)  | 
|
118  | 
||
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
119  | 
|
| 
1558.8.1
by Aaron Bentley
 Fix overall progress bar's interaction with 'note' and 'warning'  | 
120  | 
def warning(*args, **kwargs):  | 
121  | 
import bzrlib.ui  | 
|
122  | 
bzrlib.ui.ui_factory.clear_term()  | 
|
123  | 
_bzr_logger.warning(*args, **kwargs)  | 
|
124  | 
||
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
125  | 
|
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
126  | 
# configure convenient aliases for output routines
 | 
127  | 
#
 | 
|
128  | 
# TODO: deprecate them, have one name for each.
 | 
|
| 
1558.8.1
by Aaron Bentley
 Fix overall progress bar's interaction with 'note' and 'warning'  | 
129  | 
info = note  | 
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
130  | 
log_error = _bzr_logger.error  | 
131  | 
error = _bzr_logger.error  | 
|
| 
1185.43.7
by Martin Pool
 Do debug messages not through python logging  | 
132  | 
|
133  | 
||
| 
3928.2.1
by John Arbash Meinel
 Update mutter() to flush occasionally.  | 
134  | 
_last_mutter_flush_time = None  | 
135  | 
||
| 
1185.43.7
by Martin Pool
 Do debug messages not through python logging  | 
136  | 
def mutter(fmt, *args):  | 
| 
3928.2.1
by John Arbash Meinel
 Update mutter() to flush occasionally.  | 
137  | 
global _last_mutter_flush_time  | 
| 
1185.43.10
by Martin Pool
 Remove need for BZR_DEBUG to get debug info in trace file.  | 
138  | 
if _trace_file is None:  | 
139  | 
        return
 | 
|
| 
1963.2.6
by Robey Pointer
 pychecker is on crack; go back to using 'is None'.  | 
140  | 
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.  | 
141  | 
        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  | 
142  | 
|
143  | 
if isinstance(fmt, unicode):  | 
|
144  | 
fmt = fmt.encode('utf8')  | 
|
145  | 
||
| 
1185.43.10
by Martin Pool
 Remove need for BZR_DEBUG to get debug info in trace file.  | 
146  | 
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  | 
147  | 
        # It seems that if we do ascii % (unicode, ascii) we can
 | 
148  | 
        # get a unicode cannot encode ascii error, so make sure that "fmt"
 | 
|
149  | 
        # 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  | 
150  | 
real_args = []  | 
151  | 
for arg in args:  | 
|
152  | 
if isinstance(arg, unicode):  | 
|
153  | 
arg = arg.encode('utf8')  | 
|
154  | 
real_args.append(arg)  | 
|
155  | 
out = fmt % tuple(real_args)  | 
|
| 
1185.43.10
by Martin Pool
 Remove need for BZR_DEBUG to get debug info in trace file.  | 
156  | 
else:  | 
| 
1185.33.51
by Martin Pool
 Fix trace of non-ascii messages, and add test.  | 
157  | 
out = fmt  | 
| 
3928.2.1
by John Arbash Meinel
 Update mutter() to flush occasionally.  | 
158  | 
now = time.time()  | 
159  | 
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)  | 
160  | 
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  | 
161  | 
_trace_file.write(out)  | 
| 
3928.2.1
by John Arbash Meinel
 Update mutter() to flush occasionally.  | 
162  | 
    # We flush if we haven't flushed for a few seconds. We don't want to flush
 | 
163  | 
    # on every mutter, but when a command takes a while, it can be nice to see
 | 
|
164  | 
    # updates in the debug log.
 | 
|
165  | 
if (_last_mutter_flush_time is None  | 
|
166  | 
or (now - _last_mutter_flush_time) > 2.0):  | 
|
167  | 
flush = getattr(_trace_file, 'flush', None)  | 
|
168  | 
if flush is not None:  | 
|
169  | 
flush()  | 
|
170  | 
_last_mutter_flush_time = now  | 
|
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
171  | 
|
| 
1185.43.10
by Martin Pool
 Remove need for BZR_DEBUG to get debug info in trace file.  | 
172  | 
|
| 
2725.1.1
by Robert Collins
 Add -Devil flag to highlight the use of problematic API calls.  | 
173  | 
def mutter_callsite(stacklevel, fmt, *args):  | 
174  | 
"""Perform a mutter of fmt and args, logging the call trace.  | 
|
175  | 
||
176  | 
    :param stacklevel: The number of frames to show. None will show all
 | 
|
177  | 
        frames.
 | 
|
178  | 
    :param fmt: The format string to pass to mutter.
 | 
|
179  | 
    :param args: A list of substitution variables.
 | 
|
180  | 
    """
 | 
|
181  | 
outf = StringIO()  | 
|
| 
3441.5.1
by Andrew Bennetts
 Avoid necessarily calling get_parent_map when pushing.  | 
182  | 
if stacklevel is None:  | 
183  | 
limit = None  | 
|
184  | 
else:  | 
|
185  | 
limit = stacklevel + 1  | 
|
186  | 
traceback.print_stack(limit=limit, file=outf)  | 
|
| 
2725.1.1
by Robert Collins
 Add -Devil flag to highlight the use of problematic API calls.  | 
187  | 
formatted_lines = outf.getvalue().splitlines()  | 
188  | 
formatted_stack = '\n'.join(formatted_lines[:-2])  | 
|
189  | 
mutter(fmt + "\nCalled from:\n%s", *(args + (formatted_stack,)))  | 
|
190  | 
||
191  | 
||
| 
261
by Martin Pool
 - auto-rollover of .bzr.log  | 
192  | 
def _rollover_trace_maybe(trace_fname):  | 
| 
359
by Martin Pool
 - pychecker fixups  | 
193  | 
import stat  | 
| 
261
by Martin Pool
 - auto-rollover of .bzr.log  | 
194  | 
try:  | 
195  | 
size = os.stat(trace_fname)[stat.ST_SIZE]  | 
|
| 
333
by Martin Pool
 - allow trace file to grow up to 4MB  | 
196  | 
if size <= 4 << 20:  | 
| 
261
by Martin Pool
 - auto-rollover of .bzr.log  | 
197  | 
            return
 | 
198  | 
old_fname = trace_fname + '.old'  | 
|
| 
2851.3.1
by Martin Pool
 Add unit test for _rollover_trace_maybe  | 
199  | 
osutils.rename(trace_fname, old_fname)  | 
| 
261
by Martin Pool
 - auto-rollover of .bzr.log  | 
200  | 
except OSError:  | 
201  | 
        return
 | 
|
202  | 
||
203  | 
||
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
204  | 
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)  | 
205  | 
bzr_log = os.environ.get('BZR_LOG')  | 
206  | 
if bzr_log:  | 
|
207  | 
return bzr_log  | 
|
208  | 
home = os.environ.get('BZR_HOME')  | 
|
209  | 
if home is None:  | 
|
210  | 
if sys.platform == 'win32':  | 
|
211  | 
from bzrlib import win32utils  | 
|
212  | 
home = win32utils.get_home_location()  | 
|
213  | 
else:  | 
|
214  | 
home = os.path.expanduser('~')  | 
|
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
215  | 
return os.path.join(home, '.bzr.log')  | 
216  | 
||
217  | 
||
218  | 
def _open_bzr_log():  | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
219  | 
"""Open the .bzr.log trace file.  | 
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
220  | 
|
221  | 
    If the log is more than a particular length, the old file is renamed to
 | 
|
222  | 
    .bzr.log.old and a new file is started.  Otherwise, we append to the
 | 
|
223  | 
    existing file.
 | 
|
224  | 
||
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
225  | 
    This sets the global _bzr_log_filename.
 | 
| 
3173.1.2
by Martin Pool
 bzrlib.trace docs and cleanups  | 
226  | 
    """
 | 
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
227  | 
global _bzr_log_filename  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
228  | 
_bzr_log_filename = _get_bzr_log_filename()  | 
| 
2566.1.1
by Martin Pool
 Show bzr.log location in bzr --version output.  | 
229  | 
_rollover_trace_maybe(_bzr_log_filename)  | 
| 
403
by Martin Pool
 - Don't give an error if the trace file can't be opened  | 
230  | 
try:  | 
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
231  | 
bzr_log_file = open(_bzr_log_filename, 'at', 1) # line buffered  | 
232  | 
        # bzr_log_file.tell() on windows always return 0 until some writing done
 | 
|
233  | 
bzr_log_file.write('\n')  | 
|
234  | 
if bzr_log_file.tell() <= 2:  | 
|
235  | 
bzr_log_file.write("this is a debug log for diagnosing/reporting problems in bzr\n")  | 
|
236  | 
bzr_log_file.write("you can delete or truncate this file, or include sections in\n")  | 
|
237  | 
bzr_log_file.write("bug reports to https://bugs.launchpad.net/bzr/+filebug\n\n")  | 
|
238  | 
return bzr_log_file  | 
|
| 
403
by Martin Pool
 - Don't give an error if the trace file can't be opened  | 
239  | 
except IOError, e:  | 
240  | 
warning("failed to open trace file: %s" % (e))  | 
|
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
241  | 
    # TODO: What should happen if we fail to open the trace file?  Maybe the
 | 
242  | 
    # objects should be pointed at /dev/null or the equivalent?  Currently
 | 
|
243  | 
    # returns None which will cause failures later.
 | 
|
| 
3805.2.4
by John Arbash Meinel
 Handle when _open_bzr_log returns None.  | 
244  | 
return None  | 
| 
260
by Martin Pool
 - remove atexit() dependency for writing out execution times  | 
245  | 
|
| 
1097
by Martin Pool
 - send trace messages out through python logging module  | 
246  | 
|
| 
1111
by Martin Pool
 - add functions to enable and disable default logging, so that we can  | 
247  | 
def enable_default_logging():  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
248  | 
"""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.  | 
249  | 
|
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
250  | 
    This should only be called once per process.
 | 
| 
3173.1.6
by Martin Pool
 Remove _stderr_handler global  | 
251  | 
|
252  | 
    Non-command-line programs embedding bzrlib do not need to call this.  They
 | 
|
253  | 
    can instead either pass a file to _push_log_file, or act directly on
 | 
|
254  | 
    logging.getLogger("bzr").
 | 
|
| 
3805.2.1
by John Arbash Meinel
 Update trace to log when the process started.  | 
255  | 
|
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
256  | 
    Output can be redirected away by calling _push_log_file.
 | 
257  | 
    """
 | 
|
| 
3805.2.1
by John Arbash Meinel
 Update trace to log when the process started.  | 
258  | 
    # Do this before we open the log file, so we prevent
 | 
259  | 
    # get_terminal_encoding() from mutter()ing multiple times
 | 
|
260  | 
term_encoding = osutils.get_terminal_encoding()  | 
|
| 
3805.2.3
by John Arbash Meinel
 Use osutils.format_local_date() instead of time.strftime()  | 
261  | 
start_time = osutils.format_local_date(_bzr_log_start_time,  | 
262  | 
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)  | 
263  | 
    # create encoded wrapper around stderr
 | 
| 
3173.1.5
by Martin Pool
 Remove global _bzr_log_file  | 
264  | 
bzr_log_file = _open_bzr_log()  | 
| 
3805.2.4
by John Arbash Meinel
 Handle when _open_bzr_log returns None.  | 
265  | 
if bzr_log_file is not None:  | 
266  | 
bzr_log_file.write(start_time.encode('utf-8') + '\n')  | 
|
| 
3173.1.11
by Martin Pool
 Fix up renaming of push_log_file  | 
267  | 
push_log_file(bzr_log_file,  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
268  | 
r'[%(process)5d] %(asctime)s.%(msecs)03d %(levelname)s: %(message)s',  | 
269  | 
r'%Y-%m-%d %H:%M:%S')  | 
|
270  | 
    # after hooking output into bzr_log, we also need to attach a stderr
 | 
|
| 
3173.1.6
by Martin Pool
 Remove _stderr_handler global  | 
271  | 
    # handler, writing only at level info and with encoding
 | 
| 
3805.2.1
by John Arbash Meinel
 Update trace to log when the process started.  | 
272  | 
writer_factory = codecs.getwriter(term_encoding)  | 
| 
3173.1.6
by Martin Pool
 Remove _stderr_handler global  | 
273  | 
encoded_stderr = writer_factory(sys.stderr, errors='replace')  | 
274  | 
stderr_handler = logging.StreamHandler(encoded_stderr)  | 
|
275  | 
stderr_handler.setLevel(logging.INFO)  | 
|
276  | 
logging.getLogger('bzr').addHandler(stderr_handler)  | 
|
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
277  | 
|
278  | 
||
| 
3173.1.7
by Martin Pool
 Rename push/pop_log_file, and deprecate enable/disable_test_log  | 
279  | 
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  | 
280  | 
"""Intercept log and trace messages and send them to a file.  | 
281  | 
||
| 
3173.1.11
by Martin Pool
 Fix up renaming of push_log_file  | 
282  | 
    :param to_file: A file-like object to which messages will be sent.
 | 
283  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
284  | 
    :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  | 
285  | 
    previously active logging.
 | 
286  | 
    """
 | 
|
287  | 
global _trace_file  | 
|
288  | 
    # make a new handler
 | 
|
289  | 
new_handler = logging.StreamHandler(to_file)  | 
|
290  | 
new_handler.setLevel(logging.DEBUG)  | 
|
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
291  | 
if log_format is None:  | 
292  | 
log_format = '%(levelname)8s %(message)s'  | 
|
293  | 
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  | 
294  | 
    # save and remove any existing log handlers
 | 
295  | 
bzr_logger = logging.getLogger('bzr')  | 
|
296  | 
old_handlers = bzr_logger.handlers[:]  | 
|
297  | 
del bzr_logger.handlers[:]  | 
|
298  | 
    # set that as the default logger
 | 
|
299  | 
bzr_logger.addHandler(new_handler)  | 
|
300  | 
bzr_logger.setLevel(logging.DEBUG)  | 
|
301  | 
    # TODO: check if any changes are needed to the root logger
 | 
|
302  | 
    #
 | 
|
303  | 
    # TODO: also probably need to save and restore the level on bzr_logger.
 | 
|
304  | 
    # but maybe we can avoid setting the logger level altogether, and just set
 | 
|
305  | 
    # the level on the handler?
 | 
|
306  | 
    #
 | 
|
307  | 
    # save the old trace file
 | 
|
308  | 
old_trace_file = _trace_file  | 
|
309  | 
    # send traces to the new one
 | 
|
310  | 
_trace_file = to_file  | 
|
311  | 
result = new_handler, _trace_file  | 
|
312  | 
return ('log_memento', old_handlers, new_handler, old_trace_file, to_file)  | 
|
313  | 
||
314  | 
||
| 
3173.1.7
by Martin Pool
 Rename push/pop_log_file, and deprecate enable/disable_test_log  | 
315  | 
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  | 
316  | 
"""Undo changes to logging/tracing done by _push_log_file.  | 
317  | 
||
318  | 
    This flushes, but does not close the trace file.
 | 
|
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
319  | 
|
| 
3173.1.1
by Martin Pool
 New _push_log_file and _pop_log_file as a cleaner stack, towards a fix for #124153  | 
320  | 
    Takes the memento returned from _push_log_file."""
 | 
321  | 
global _trace_file  | 
|
322  | 
_trace_file = old_trace_file  | 
|
323  | 
bzr_logger = logging.getLogger('bzr')  | 
|
324  | 
bzr_logger.removeHandler(new_handler)  | 
|
325  | 
    # must be closed, otherwise logging will try to close it atexit, and the
 | 
|
326  | 
    # file will likely already be closed underneath.
 | 
|
327  | 
new_handler.close()  | 
|
328  | 
bzr_logger.handlers = old_handlers  | 
|
329  | 
new_trace_file.flush()  | 
|
330  | 
||
331  | 
||
| 
3427.2.2
by James Westby
 Just print the exception, keeping the API of log_exception_quietly the same.  | 
332  | 
def log_exception_quietly():  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
333  | 
"""Log the last exception to the trace file only.  | 
334  | 
||
| 
3943.8.1
by Marius Kruger
 remove all trailing whitespace from bzr source  | 
335  | 
    Used for exceptions that occur internally and that may be
 | 
336  | 
    interesting to developers but not to users.  For example,
 | 
|
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
337  | 
    errors loading plugins.
 | 
338  | 
    """
 | 
|
| 
3427.2.2
by James Westby
 Just print the exception, keeping the API of log_exception_quietly the same.  | 
339  | 
mutter(traceback.format_exc())  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
340  | 
|
341  | 
||
342  | 
def set_verbosity_level(level):  | 
|
343  | 
"""Set the verbosity level.  | 
|
344  | 
||
345  | 
    :param level: -ve for quiet, 0 for normal, +ve for verbose
 | 
|
346  | 
    """
 | 
|
347  | 
global _verbosity_level  | 
|
348  | 
_verbosity_level = level  | 
|
349  | 
_update_logging_level(level < 0)  | 
|
350  | 
||
351  | 
||
352  | 
def get_verbosity_level():  | 
|
353  | 
"""Get the verbosity level.  | 
|
354  | 
||
355  | 
    See set_verbosity_level() for values.
 | 
|
356  | 
    """
 | 
|
357  | 
return _verbosity_level  | 
|
358  | 
||
359  | 
||
360  | 
def be_quiet(quiet=True):  | 
|
361  | 
    # Perhaps this could be deprecated now ...
 | 
|
362  | 
if quiet:  | 
|
363  | 
set_verbosity_level(-1)  | 
|
364  | 
else:  | 
|
365  | 
set_verbosity_level(0)  | 
|
366  | 
||
367  | 
||
368  | 
def _update_logging_level(quiet=True):  | 
|
369  | 
"""Hide INFO messages if quiet."""  | 
|
370  | 
if quiet:  | 
|
| 
3173.1.6
by Martin Pool
 Remove _stderr_handler global  | 
371  | 
_bzr_logger.setLevel(logging.WARNING)  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
372  | 
else:  | 
| 
3173.1.6
by Martin Pool
 Remove _stderr_handler global  | 
373  | 
_bzr_logger.setLevel(logging.INFO)  | 
| 
3173.1.4
by Martin Pool
 Rearrange and clean up bzr trace/logging  | 
374  | 
|
375  | 
||
376  | 
def is_quiet():  | 
|
377  | 
"""Is the verbosity level negative?"""  | 
|
378  | 
return _verbosity_level < 0  | 
|
379  | 
||
380  | 
||
381  | 
def is_verbose():  | 
|
382  | 
"""Is the verbosity level positive?"""  | 
|
383  | 
return _verbosity_level > 0  | 
|
384  | 
||
385  | 
||
| 
3698.1.2
by John Arbash Meinel
 Make message optional, don't check the memory flag directly.  | 
386  | 
def debug_memory(message='', short=True):  | 
| 
3698.1.1
by John Arbash Meinel
 Move the memory debugging into a helper function.  | 
387  | 
"""Write out a memory dump."""  | 
| 
4011.1.1
by John Arbash Meinel
 Implement -Dmemory for win32  | 
388  | 
if sys.platform == 'win32':  | 
389  | 
from bzrlib import win32utils  | 
|
390  | 
win32utils.debug_memory_win32api(message=message, short=short)  | 
|
391  | 
else:  | 
|
392  | 
_debug_memory_proc(message=message, short=short)  | 
|
393  | 
||
394  | 
||
395  | 
_short_fields = ('VmPeak', 'VmSize', 'VmRSS')  | 
|
396  | 
||
397  | 
def _debug_memory_proc(message='', short=True):  | 
|
| 
3698.1.1
by John Arbash Meinel
 Move the memory debugging into a helper function.  | 
398  | 
try:  | 
399  | 
status_file = file('/proc/%s/status' % os.getpid(), 'rb')  | 
|
400  | 
except IOError:  | 
|
401  | 
        return
 | 
|
402  | 
try:  | 
|
403  | 
status = status_file.read()  | 
|
404  | 
finally:  | 
|
405  | 
status_file.close()  | 
|
| 
3698.1.2
by John Arbash Meinel
 Make message optional, don't check the memory flag directly.  | 
406  | 
if message:  | 
407  | 
note(message)  | 
|
| 
3698.1.1
by John Arbash Meinel
 Move the memory debugging into a helper function.  | 
408  | 
for line in status.splitlines():  | 
409  | 
if not short:  | 
|
410  | 
note(line)  | 
|
411  | 
else:  | 
|
412  | 
for field in _short_fields:  | 
|
413  | 
if line.startswith(field):  | 
|
414  | 
note(line)  | 
|
415  | 
                    break
 | 
|
416  | 
||
417  | 
||
| 
1740.5.2
by Martin Pool
 Improved tests for display of exceptions.  | 
418  | 
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  | 
419  | 
"""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  | 
420  | 
|
421  | 
    This will show either a full traceback or a short message as appropriate.
 | 
|
422  | 
||
423  | 
    :return: The appropriate exit code for this error.
 | 
|
424  | 
    """
 | 
|
| 
1740.5.3
by Martin Pool
 Cleanup more exception-formatting code  | 
425  | 
exc_type, exc_object, exc_tb = exc_info  | 
| 
1711.2.86
by John Arbash Meinel
 Restore logging of full traceback. Helps with debugging tests.  | 
426  | 
    # Log the full traceback to ~/.bzr.log
 | 
| 
3427.2.2
by James Westby
 Just print the exception, keeping the API of log_exception_quietly the same.  | 
427  | 
log_exception_quietly()  | 
| 
1740.5.3
by Martin Pool
 Cleanup more exception-formatting code  | 
428  | 
if (isinstance(exc_object, IOError)  | 
429  | 
and getattr(exc_object, 'errno', None) == errno.EPIPE):  | 
|
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
430  | 
err_file.write("bzr: broken pipe\n")  | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
431  | 
return errors.EXIT_ERROR  | 
| 
1740.5.3
by Martin Pool
 Cleanup more exception-formatting code  | 
432  | 
elif isinstance(exc_object, KeyboardInterrupt):  | 
| 
2911.6.1
by Blake Winton
 Change 'print >> f,'s to 'f.write('s.  | 
433  | 
err_file.write("bzr: interrupted\n")  | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
434  | 
return errors.EXIT_ERROR  | 
| 
3497.3.2
by Martin Pool
 Show short error for missing libraries  | 
435  | 
elif isinstance(exc_object, ImportError) \  | 
436  | 
and str(exc_object).startswith("No module named "):  | 
|
437  | 
report_user_error(exc_info, err_file,  | 
|
438  | 
'You may need to install this Python library separately.')  | 
|
439  | 
return errors.EXIT_ERROR  | 
|
| 
2067.3.2
by Martin Pool
 Error cleanup review comments:  | 
440  | 
elif not getattr(exc_object, 'internal_error', True):  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
441  | 
report_user_error(exc_info, err_file)  | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
442  | 
return errors.EXIT_ERROR  | 
| 
1740.5.6
by Martin Pool
 Clean up many exception classes.  | 
443  | 
elif isinstance(exc_object, (OSError, IOError)):  | 
444  | 
        # Might be nice to catch all of these and show them as something more
 | 
|
445  | 
        # 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.  | 
446  | 
report_user_error(exc_info, err_file)  | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
447  | 
return errors.EXIT_ERROR  | 
| 
1740.5.1
by Martin Pool
 When an unhandled exception occurs, write the traceback to stderr.  | 
448  | 
else:  | 
| 
1551.9.3
by Aaron Bentley
 Revert buggy apport changes  | 
449  | 
report_bug(exc_info, err_file)  | 
| 
2713.2.1
by Martin Pool
 Return exitcode 4 if an internal error occurs  | 
450  | 
return errors.EXIT_INTERNAL_ERROR  | 
| 
1740.5.1
by Martin Pool
 When an unhandled exception occurs, write the traceback to stderr.  | 
451  | 
|
452  | 
||
| 
3427.2.2
by James Westby
 Just print the exception, keeping the API of log_exception_quietly the same.  | 
453  | 
def print_exception(exc_info, err_file):  | 
454  | 
exc_type, exc_object, exc_tb = exc_info  | 
|
455  | 
err_file.write("bzr: ERROR: %s.%s: %s\n" % (  | 
|
456  | 
exc_type.__module__, exc_type.__name__, exc_object))  | 
|
457  | 
err_file.write('\n')  | 
|
458  | 
traceback.print_exception(exc_type, exc_object, exc_tb, file=err_file)  | 
|
459  | 
||
460  | 
||
| 
1740.5.1
by Martin Pool
 When an unhandled exception occurs, write the traceback to stderr.  | 
461  | 
# TODO: Should these be specially encoding the output?
 | 
| 
3497.3.2
by Martin Pool
 Show short error for missing libraries  | 
462  | 
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  | 
463  | 
"""Report to err_file an error that's not an internal error.  | 
464  | 
||
465  | 
    These don't get a traceback unless -Derror was given.
 | 
|
| 
3497.3.2
by Martin Pool
 Show short error for missing libraries  | 
466  | 
|
467  | 
    :param exc_info: 3-tuple from sys.exc_info()
 | 
|
468  | 
    :param advice: Extra advice to the user to be printed following the
 | 
|
469  | 
        exception.
 | 
|
| 
2095.5.1
by Martin Pool
 Add new -Derror global option to always display tracebacks  | 
470  | 
    """
 | 
| 
2095.5.2
by Martin Pool
 save commit message if commit fails (#32054)  | 
471  | 
if 'error' in debug.debug_flags:  | 
| 
3427.2.2
by James Westby
 Just print the exception, keeping the API of log_exception_quietly the same.  | 
472  | 
print_exception(exc_info, err_file)  | 
| 
2095.5.1
by Martin Pool
 Add new -Derror global option to always display tracebacks  | 
473  | 
        return
 | 
| 
2911.6.3
by Blake Winton
 Implemented suggestions from John Arbash Meinel.  | 
474  | 
err_file.write("bzr: ERROR: %s\n" % (exc_info[1],))  | 
| 
3497.3.2
by Martin Pool
 Show short error for missing libraries  | 
475  | 
if advice:  | 
476  | 
err_file.write("%s\n" % (advice,))  | 
|
| 
1740.5.1
by Martin Pool
 When an unhandled exception occurs, write the traceback to stderr.  | 
477  | 
|
478  | 
||
479  | 
def report_bug(exc_info, err_file):  | 
|
| 
1740.5.2
by Martin Pool
 Improved tests for display of exceptions.  | 
480  | 
"""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.  | 
481  | 
from bzrlib.crash import report_bug  | 
482  | 
report_bug(exc_info, err_file)  |