diff options
Diffstat (limited to 'resources/tools/presentation')
| -rw-r--r-- | resources/tools/presentation/generator_CPTA.py | 2 | ||||
| -rw-r--r-- | resources/tools/presentation/input_data_files.py | 33 |
2 files changed, 30 insertions, 5 deletions
diff --git a/resources/tools/presentation/generator_CPTA.py b/resources/tools/presentation/generator_CPTA.py index 4f722574dd..9780d35488 100644 --- a/resources/tools/presentation/generator_CPTA.py +++ b/resources/tools/presentation/generator_CPTA.py @@ -327,8 +327,6 @@ def _generate_all_charts(spec, input_data): logs = list() - logging.info(" Generating the chart '{0}' ...". - format(graph.get("title", ""))) logs.append(("INFO", " Generating the chart '{0}' ...". format(graph.get("title", "")))) diff --git a/resources/tools/presentation/input_data_files.py b/resources/tools/presentation/input_data_files.py index 15d7d02b7c..3ab99c3845 100644 --- a/resources/tools/presentation/input_data_files.py +++ b/resources/tools/presentation/input_data_files.py @@ -16,12 +16,15 @@ Download all data. """ import re +import requests from os import rename, mkdir from os.path import join from zipfile import ZipFile, is_zipfile, BadZipfile from httplib import responses -from requests import get, codes, RequestException, Timeout, TooManyRedirects, \ +from requests.adapters import HTTPAdapter +from requests.packages.urllib3.util.retry import Retry +from requests import codes, RequestException, Timeout, TooManyRedirects, \ HTTPError, ConnectionError from errors import PresentationError @@ -49,17 +52,41 @@ def _download_file(url, file_name, log): :rtype: bool """ + def requests_retry_session(retries=3, + backoff_factor=0.3, + status_forcelist=(500, 502, 504)): + """ + + :param retries: + :param backoff_factor: + :param status_forcelist: + :returns: + """ + + retry = Retry( + total=retries, + read=retries, + connect=retries, + backoff_factor=backoff_factor, + status_forcelist=status_forcelist, + ) + adapter = HTTPAdapter(max_retries=retry) + session = requests.Session() + session.mount('http://', adapter) + session.mount('https://', adapter) + return session + success = False try: log.append(("INFO", " Connecting to '{0}' ...".format(url))) - response = get(url, stream=True) + response = requests_retry_session().get(url, stream=True) code = response.status_code log.append(("INFO", " {0}: {1}".format(code, responses[code]))) if code != codes["OK"]: url = url.replace("_info", "") log.append(("INFO", " Connecting to '{0}' ...".format(url))) - response = get(url, stream=True) + response = requests_retry_session().get(url, stream=True) code = response.status_code log.append(("INFO", " {0}: {1}".format(code, responses[code]))) if code != codes["OK"]: |