LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Packages Projects Releases 282 Wiki Activity

Merge pull request #507 from lbryio/fix_download_timeout

Browse source 
Fix downloading not timing out properly when unable to download sd blob
This commit is contained in:
Alex Grin 2017-03-03 17:14:00 -05:00 committed by GitHub
parent 9350b9e127 d642ba039d
commit daa0ff036d
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -20,6 +20,7 @@ at anytime.
### Fixed ### Fixed
* Fixed ExchangeRateManager freezing the app * Fixed ExchangeRateManager freezing the app
* Fixed download not timing out properly when downloading sd blob
* *
* *

4
lbrynet/lbrynet_daemon/Downloader.py
View file

@ -176,13 +176,13 @@ class GetStream(object):
log.info("Downloading lbry://%s (%s) --> %s", name, self.sd_hash[:6], self.download_path) log.info("Downloading lbry://%s (%s) --> %s", name, self.sd_hash[:6], self.download_path)
self.finished_deferred = self.downloader.start() self.finished_deferred = self.downloader.start()
self.finished_deferred.addCallback(self.finish, name) self.finished_deferred.addCallback(self.finish, name)
yield self.data_downloading_deferred
@defer.inlineCallbacks @defer.inlineCallbacks
def start(self, stream_info, name): def start(self, stream_info, name):
try: try:
safe_start(self.checker) safe_start(self.checker)
yield self.download(stream_info, name) self.download(stream_info, name)
yield self.data_downloading_deferred
defer.returnValue(self.download_path) defer.returnValue(self.download_path)
except Exception as err: except Exception as err:
safe_stop(self.checker) safe_stop(self.checker)