1.加入超时重试

This commit is contained in:
facat 2019-06-16 23:23:07 +08:00
parent da63baeb8d
commit 6e0056aed3
2 changed files with 30 additions and 19 deletions

View File

@ -14,19 +14,28 @@ def download_file(
server_name = server["name"]
chunk_read = 0
s_time = datetime.datetime.now()
with requests.get(url, stream=True) as r:
for chunk in r.iter_content(chunk_size):
if chunk:
chunk_read += len(chunk)
e_time = datetime.datetime.now()
duration = (e_time - s_time).total_seconds()
if chunk_read >= file_size:
break
if duration >= longest_time:
print('Longer than {longest_time} seconds. Stopped.'.format(longest_time=longest_time))
break
speed = chunk_read / duration / 1024 / 1024 * 8 # mega bit
model.add_record(server_name, speed)
# print(now_timestamp{} MB download".format(chunk_read / 1024 / 1024))
# print("{} seconds".format(duration / 1))
return speed
try:
with requests.get(url, stream=True, timeout=longest_time) as r:
for chunk in r.iter_content(chunk_size):
if chunk:
chunk_read += len(chunk)
e_time = datetime.datetime.now()
duration = (e_time - s_time).total_seconds()
if chunk_read >= file_size:
break
if duration >= longest_time:
print(
"{server} longer than {longest_time} seconds. Stopped.".format(
longest_time=longest_time, server=server_name
)
)
break
speed = chunk_read / duration / 1024 / 1024 * 8 # mega bit
model.add_record(server_name, speed)
print("{server}:{speed} Mbit/s".format(server=server_name, speed=speed))
except requests.exceptions.Timeout as e:
print(
"timeout before wait {timeout} seconds. Error:{err}".format(
err=str(e), timeout=longest_time
)
)

View File

@ -5,7 +5,9 @@ import downloader
if __name__ == "__main__":
servers = [{"url": "http://67.209.190.15/1000M.bin", "name": "bwg"}]
speed = downloader.download_file(servers)
print(speed)
servers = [
{"url": "http://67.209.190.15/1000M.bin", "name": "bwg"},
{"url": "http://192.168.1.130:10010/1000MB.bin", "name": "local"},
]
downloader.download_file(servers)
print("Finished.")