From a14f6a6d8b9e69fac8879001f24833d28b352d63 Mon Sep 17 00:00:00 2001
From: Hiroshi Miura <miurahr@linux.com>
Date: Tue, 6 Jul 2021 08:44:00 +0900
Subject: [PATCH] helper: make max_retries configurable (#296)

* helper: make max_retries configurable

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
---
 aqt/helper.py    | 57 ++++++++++++++++++++++++++++++------------------
 aqt/settings.ini |  9 +++++---
 ci/settings.ini  |  8 +++++--
 3 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/aqt/helper.py b/aqt/helper.py
index 71124b9..5d8b6b0 100644
--- a/aqt/helper.py
+++ b/aqt/helper.py
@@ -33,6 +33,7 @@ from typing import Callable, Dict, Iterable, List, Optional
 from urllib.parse import urlparse
 
 import requests
+import requests.adapters
 from semantic_version import Version
 
 from aqt.exceptions import ArchiveConnectionError, ArchiveDownloadError, CliInputError
@@ -124,7 +125,10 @@ def _check_content_type(ct: str) -> bool:
 def getUrl(url: str, timeout) -> str:
     logger = getLogger("aqt.helper")
     with requests.Session() as session:
-        adapter = requests.adapters.HTTPAdapter()
+        retries = requests.adapters.Retry(
+            total=Settings.max_retries, backoff_factor=Settings.backoff_factor
+        )
+        adapter = requests.adapters.HTTPAdapter(max_retries=retries)
         session.mount("http://", adapter)
         session.mount("https://", adapter)
         try:
@@ -162,7 +166,10 @@ def getUrl(url: str, timeout) -> str:
 def downloadBinaryFile(url: str, out: str, hash_algo: str, exp: str, timeout):
     logger = getLogger("aqt.helper")
     with requests.Session() as session:
-        adapter = requests.adapters.HTTPAdapter()
+        retries = requests.adapters.Retry(
+            total=Settings.max_retries, backoff_factor=Settings.backoff_factor
+        )
+        adapter = requests.adapters.HTTPAdapter(max_retries=retries)
         session.mount("http://", adapter)
         session.mount("https://", adapter)
         try:
@@ -251,23 +258,6 @@ def altlink(url: str, alt: str):
             )
 
 
-class MyConfigParser(configparser.ConfigParser):
-    def getlist(self, section: str, option: str, fallback=[]) -> List[str]:
-        value = self.get(section, option)
-        try:
-            result = list(filter(None, (x.strip() for x in value.splitlines())))
-        except Exception:
-            result = fallback
-        return result
-
-    def getlistint(self, section: str, option: str, fallback=[]):
-        try:
-            result = [int(x) for x in self.getlist(section, option)]
-        except Exception:
-            result = fallback
-        return result
-
-
 class MyQueueListener(QueueListener):
     def __init__(self, queue):
         handlers = []
@@ -361,6 +351,23 @@ def xml_to_modules(
     return packages
 
 
+class MyConfigParser(configparser.ConfigParser):
+    def getlist(self, section: str, option: str, fallback=[]) -> List[str]:
+        value = self.get(section, option)
+        try:
+            result = list(filter(None, (x.strip() for x in value.splitlines())))
+        except Exception:
+            result = fallback
+        return result
+
+    def getlistint(self, section: str, option: str, fallback=[]):
+        try:
+            result = [int(x) for x in self.getlist(section, option)]
+        except Exception:
+            result = fallback
+        return result
+
+
 class Settings:
     """Class to hold configuration and settings.
     Actual values are stored in 'settings.ini' file.
@@ -454,11 +461,19 @@ class Settings:
 
     @property
     def connection_timeout(self):
-        return self.config.getfloat("aqt", "connection_timeout", fallback=3.5)
+        return self.config.getfloat("requests", "connection_timeout", fallback=3.5)
 
     @property
     def response_timeout(self):
-        return self.config.getfloat("aqt", "response_timeout", fallback=3.5)
+        return self.config.getfloat("requests", "response_timeout", fallback=10)
+
+    @property
+    def max_retries(self):
+        return self.config.getfloat("requests", "max_retries", fallback=5)
+
+    @property
+    def backoff_factor(self):
+        return self.config.getfloat("requests", "retry_backoff", fallback=0.1)
 
     @property
     def fallbacks(self):
diff --git a/aqt/settings.ini b/aqt/settings.ini
index 4dd1a96..a7c72fd 100644
--- a/aqt/settings.ini
+++ b/aqt/settings.ini
@@ -2,15 +2,18 @@
 
 [aqt]
 concurrency: 4
-connection_timeout: 3.5
-response_timeout: 30
 baseurl: https://download.qt.io
 7zcmd: 7z
 
+[requests]
+connection_timeout: 3.5
+response_timeout: 30
+max_retries: 5
+retry_backoff: 0.1
+
 [mirrors]
 blacklist:
     http://mirrors.ocf.berkeley.edu
-    http://mirrors.ustc.edu.cn
     http://mirrors.tuna.tsinghua.edu.cn
     http://mirrors.geekpie.club
 fallbacks:
diff --git a/ci/settings.ini b/ci/settings.ini
index 9f387ea..ae1f837 100644
--- a/ci/settings.ini
+++ b/ci/settings.ini
@@ -2,11 +2,15 @@
 
 [aqt]
 concurrency: 2
-connection_timeout: 10
-response_timeout: 10
 baseurl: https://download.qt.io
 7zcmd: 7z
 
+[requests]
+connection_timeout: 30
+response_timeout: 30
+max_retries: 5
+retry_backoff: 0.1
+
 [mirrors]
 blacklist:
     http://mirrors.ocf.berkeley.edu