Merge pull request #1624 from side2k/more_verbose_download_cancel

[MRG+1] added more verbosity for log and for exception when download is cancelled because of a size limit
This commit is contained in:
Mikhail Korobov 2016-01-19 00:17:56 +05:00
commit fdc3c9d561
1 changed files with 7 additions and 4 deletions

View File

@ -239,11 +239,14 @@ class ScrapyAgent(object):
expected_size = txresponse.length if txresponse.length != UNKNOWN_LENGTH else -1
if maxsize and expected_size > maxsize:
logger.error("Expected response size (%(size)s) larger than "
"download max size (%(maxsize)s).",
{'size': expected_size, 'maxsize': maxsize})
error_message = ("Cancelling download of {url}: expected response "
"size ({size}) larger than "
"download max size ({maxsize})."
).format(url=request.url, size=expected_size, maxsize=maxsize)
logger.error(error_message)
txresponse._transport._producer.loseConnection()
raise defer.CancelledError()
raise defer.CancelledError(error_message)
if warnsize and expected_size > warnsize:
logger.warning("Expected response size (%(size)s) larger than "