tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

download.py: make logging safe in ValidatedBucket

This commit is contained in:
Brian Warner 2008-02-06 02:50:34 -07:00
parent 590b020a44
commit 40c2371e77
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/allmydata/download.py
View File

@ -159,6 +159,7 @@ class ValidatedBucket:
def _got_data(self, res, blocknum): def _got_data(self, res, blocknum):
sharehashes, blockhashes, blockdata = res sharehashes, blockhashes, blockdata = res
blockhash = None # to make logging it safe
try: try:
if not self._share_hash: if not self._share_hash:
@ -197,7 +198,7 @@ class ValidatedBucket:
received from the remote peer were bad.""") received from the remote peer were bad.""")
log.msg(" have self._share_hash: %s" % bool(self._share_hash)) log.msg(" have self._share_hash: %s" % bool(self._share_hash))
log.msg(" block length: %d" % len(blockdata)) log.msg(" block length: %d" % len(blockdata))
log.msg(" block hash: %s" % idlib.b2a_or_none(blockhash)) # not safe log.msg(" block hash: %s" % idlib.b2a_or_none(blockhash))
if len(blockdata) < 100: if len(blockdata) < 100:
log.msg(" block data: %r" % (blockdata,)) log.msg(" block data: %r" % (blockdata,))
else: else: