← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

  • Committer: John Arbash Meinel
  • Date: 2005-09-15 21:35:53 UTC
  • mfrom: (907.1.57)
  • mto: (1393.2.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: john@arbash-meinel.com-20050915213552-a6c83a5ef1e20897
(broken) Transport work is merged in. Tests do not pass yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
54
54
    # can get the exception details is we suppress them here.
55
55
 
56
56
    def format(self, record):
 
57
        s = 'bzr: '
57
58
        if record.levelno >= logging.WARNING:
58
 
            s = 'bzr: ' + record.levelname + ': '
59
 
        else:
60
 
            s = ''
 
59
            s += record.levelname + ': '
61
60
            
62
 
        s += record.getMessage()
63
 
 
64
 
        ##import textwrap
65
 
        ##s = textwrap.fill(s)
 
61
        s += record.getMessage() 
66
62
            
67
63
        if record.exc_info:
68
64
            # give just a summary of the exception, not the whole thing
105
101
            return
106
102
        old_fname = trace_fname + '.old'
107
103
 
108
 
        from osutils import rename
109
 
        rename(trace_fname, old_fname)
 
104
        try:
 
105
            # must remove before rename on windows
 
106
            os.remove(old_fname)
 
107
        except OSError:
 
108
            pass
110
109
 
 
110
        try:
 
111
            # might fail if in use on windows
 
112
            os.rename(trace_fname, old_fname)
 
113
        except OSError:
 
114
            pass
111
115
    except OSError:
112
116
        return
113
117
 
164
168
    if msg == None:
165
169
        ei = sys.exc_info()
166
170
        msg = str(ei[1])
 
171
 
167
172
    if msg and (msg[-1] == '\n'):
168
173
        msg = msg[:-1]
169
 
    ## msg = "(%s) %s" % (str(type(ei[1])), msg)
 
174
        
170
175
    _bzr_logger.exception(msg)
171
176
 
172
177
 
192
197
    logging.getLogger('').addHandler(_stderr_handler)
193
198
 
194
199
 
 
200
 
195
201
def disable_default_logging():
196
202
    """Turn off default log handlers.
197
203