Merge pull request #341 from YunoHost/timeout_dyndns

[fix] timeout on request to avoid blocking process
This commit is contained in:
Laurent Peuch 2017-08-11 08:49:51 +02:00 committed by GitHub
commit cd9444f647

View file

@ -183,12 +183,15 @@ def dyndns_update(dyn_host="dyndns.yunohost.org", domain=None, key=None,
try: try:
# Check if domain is registered # Check if domain is registered
if requests.get('https://{0}/test/{1}'.format( request_url = 'https://{0}/test/{1}'.format(dyn_host, _domain)
dyn_host, _domain)).status_code == 200: if requests.get(request_url, timeout=30).status_code == 200:
continue continue
except requests.ConnectionError: except requests.ConnectionError:
raise MoulinetteError(errno.ENETUNREACH, raise MoulinetteError(errno.ENETUNREACH,
m18n.n('no_internet_connection')) m18n.n('no_internet_connection'))
except requests.exceptions.Timeout:
logger.warning("Correction timed out on {}, skip it".format(
request_url))
domain = _domain domain = _domain
key = path key = path
break break