Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #364: clarify logged error when incorrect file size detected

This commit is contained in:
David Wilson 2018-11-06 22:14:15 +00:00
parent 65d9eec353
commit 4267014ca6
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mitogen/service.py
View File

@ -772,7 +772,7 @@ class FileService(Service):
def register(self, path): def register(self, path):
""" """
Authorize a path for access by children. Repeat calls with the same Authorize a path for access by children. Repeat calls with the same
path is harmless. path has no effect.
:param str path: :param str path:
File path. File path.
@ -949,6 +949,7 @@ class FileService(Service):
sender=recv.to_sender(), sender=recv.to_sender(),
) )
received_bytes = 0
for chunk in recv: for chunk in recv:
s = chunk.unpickle() s = chunk.unpickle()
LOG.debug('get_file(%r): received %d bytes', path, len(s)) LOG.debug('get_file(%r): received %d bytes', path, len(s))
@ -958,11 +959,19 @@ class FileService(Service):
size=len(s), size=len(s),
).close() ).close()
out_fp.write(s) out_fp.write(s)
received_bytes += len(s)
ok = out_fp.tell() == metadata['size'] ok = received_bytes == metadata['size']
if not ok: if received_bytes < metadata['size']:
LOG.error('get_file(%r): receiver was closed early, controller ' LOG.error('get_file(%r): receiver was closed early, controller '
'is likely shutting down.', path) 'may be shutting down, or the file was truncated '
'during transfer. Expected %d bytes, received %d.',
path, metadata['size'], received_bytes)
elif received_bytes > metadata['size']:
LOG.error('get_file(%r): the file appears to have grown '
'while transfer was in progress. Expected %d '
'bytes, received %d.',
path, metadata['size'], received_bytes)
LOG.debug('target.get_file(): fetched %d bytes of %r from %r in %dms', LOG.debug('target.get_file(): fetched %d bytes of %r from %r in %dms',
metadata['size'], path, context, 1000 * (time.time() - t0)) metadata['size'], path, context, 1000 * (time.time() - t0))