← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/trace.py

  • Committer: Robert Collins
  • Date: 2005-09-28 09:35:50 UTC
  • mfrom: (1185.1.47)
  • Revision ID: robertc@robertcollins.net-20050928093550-3ca194dfaffc79f1
merge from integration

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/trace.py
58
58
        if record.levelno >= logging.WARNING:
59
59
            s += record.levelname + ': '
60
60
            
61
 
        s += record.getMessage() 
 
61
        s += record.getMessage()
 
62
 
 
63
        ##import textwrap
 
64
        ##s = textwrap.fill(s)
62
65
            
63
66
        if record.exc_info:
64
67
            # give just a summary of the exception, not the whole thing
101
104
            return
102
105
        old_fname = trace_fname + '.old'
103
106
 
104
 
        try:
105
 
            # must remove before rename on windows
106
 
            os.remove(old_fname)
107
 
        except OSError:
108
 
            pass
 
107
        from osutils import rename
 
108
        rename(trace_fname, old_fname)
109
109
 
110
 
        try:
111
 
            # might fail if in use on windows
112
 
            os.rename(trace_fname, old_fname)
113
 
        except OSError:
114
 
            pass
115
110
    except OSError:
116
111
        return
117
112
 
181
176
    global _stderr_handler, _file_handler
182
177
 
183
178
    _stderr_handler = logging.StreamHandler()
 
179
    _stderr_handler.setFormatter(QuietFormatter())
184
180
 
185
181
    if not _file_handler:
186
 
        open_tracefile()                # also adds it
 
182
        open_tracefile()
187
183
 
188
 
    debug_flag = False
189
 
    try:
190
 
        debug_flag = bool(os.environ['BZR_DEBUG'])
191
 
    except:
192
 
        pass
193
 
        
194
 
    if debug_flag:
 
184
    if os.environ.get('BZR_DEBUG'):
195
185
        level = logging.DEBUG
196
 
        fmt = '%(levelname)8s: %(message)s'
197
 
        _stderr_handler.setFormatter(logging.Formatter(fmt))
198
186
    else:
199
187
        level = logging.INFO
200
 
        # show only summary of exceptions
201
 
        _stderr_handler.setFormatter(QuietFormatter())
202
188
 
203
 
    _stderr_handler.setLevel(level)
 
189
    _stderr_handler.setLevel(logging.INFO)
204
190
    _file_handler.setLevel(level)
205
191
 
206
192
    logging.getLogger('').addHandler(_stderr_handler)
207
193
 
208
194
 
209
 
 
210
195
def disable_default_logging():
211
196
    """Turn off default log handlers.
212
197