From 29e451a326749b183f94ec97387799d7346797f5 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Wed, 27 Sep 2017 17:25:21 -0400 Subject: [PATCH] stop failed downloader outside of GetStream --- lbrynet/daemon/Downloader.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lbrynet/daemon/Downloader.py b/lbrynet/daemon/Downloader.py index f801ee474..3bfe4bf08 100644 --- a/lbrynet/daemon/Downloader.py +++ b/lbrynet/daemon/Downloader.py @@ -76,7 +76,7 @@ class GetStream(object): Check if we've got the first data blob in the stream yet """ self.timeout_counter += 1 - if self.timeout_counter >= self.timeout: + if self.timeout_counter > self.timeout: if not self.data_downloading_deferred.called: self.data_downloading_deferred.errback(DownloadDataTimeout(self.sd_hash)) @@ -213,9 +213,8 @@ class GetStream(object): try: yield self.data_downloading_deferred - except Exception as err: - self.downloader.stop() + except DownloadDataTimeout as err: safe_stop_looping_call(self.checker) - raise + raise err defer.returnValue((self.downloader, self.finished_deferred))