← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: John Arbash Meinel
  • Date: 2009-12-11 21:57:03 UTC
  • mto: (4896.1.3 2.1.0b4-dev)
  • mto: This revision was merged to the branch mainline in revision 4898.
  • Revision ID: john@arbash-meinel.com-20091211215703-zxl1ygia6mlnvfyo
Get rid of -Dhpssthread, just always include it.

We might actually consider changing mutter() with a -Dlogthread sort of flag.
As it could be useful to have all threads and pids get logged.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
1153
1153
            t = ''
1154
1154
        else:
1155
1155
            t = '%5.3fs ' % (time.clock() - self._response_start_time)
1156
 
        if 'hpssthread' in debug.debug_flags:
1157
 
            t_info = ' [%s] ' % (self._thread_id,)
1158
 
        else:
1159
 
            t_info = ' '
1160
1156
        if extra_bytes is None:
1161
1157
            extra = ''
1162
1158
        else:
1163
1159
            extra = ' ' + repr(extra_bytes[:40])
1164
1160
            if len(extra) > 33:
1165
1161
                extra = extra[:29] + extra[-1] + '...'
1166
 
        mutter('%12s:%s%s%s%s'
1167
 
               % (action, t_info, t, message, extra))
 
1162
        mutter('%12s: [%s] %s%s%s'
 
1163
               % (action, self._thread_id, t, message, extra))
1168
1164
 
1169
1165
    def send_error(self, exception):
1170
1166
        if self.response_sent: