From b62bb37776faa12139edcc051f84a591e205f35e Mon Sep 17 00:00:00 2001 From: Ken Roberts Date: Thu, 19 Feb 2015 09:17:04 -0800 Subject: [PATCH] Reraise exception if retries > CONNECTION_RETRIES --- openlp/core/utils/__init__.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/openlp/core/utils/__init__.py b/openlp/core/utils/__init__.py index d4c4ca46f..ea896fad7 100644 --- a/openlp/core/utils/__init__.py +++ b/openlp/core/utils/__init__.py @@ -407,16 +407,24 @@ def get_web_page(url, header=None, update_openlp=False): log.exception('URLError on {}'.format(url)) log.exception('URLError: {}'.format(err.reason)) page = None + if retries > CONNECTION_RETRIES: + raise except socket.timeout: log.exception('Socket timeout: {}'.format(url)) page = None + if retries > CONNECTION_RETRIES: + raise except ConnectionRefusedError: log.exception('ConnectionRefused: {}'.format(url)) page = None + if retries > CONNECTION_RETRIES: + raise break except ConnectionError: log.exception('Connection error: {}'.format(url)) page = None + if retries > CONNECTION_RETRIES: + raise except: # Don't know what's happening, so reraise the original raise