openstack
/
heat
Code Issues Proposed changes

Merge "Catch socket.timeout for connectivity error when streaming"

This commit is contained in:
Zuul 2019-01-07 11:07:43 +00:00 committed by Gerrit Code Review
parent 6f0f14a3a0 e3d54b74fa
commit 48d3280070
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/common/urlfetch.py
View File

@ -13,6 +13,8 @@
"""Utility for fetching a resource (e.g. a template) from a URL."""
import socket
from oslo_config import cfg
from oslo_log import log as logging
import requests
@ -74,6 +76,6 @@ def get(url, allowed_schemes=('http', 'https')):
cfg.CONF.max_template_size)
return result
except exceptions.RequestException as ex:
except (exceptions.RequestException, socket.timeout) as ex:
LOG.info('Failed to retrieve template: %s', ex)
raise URLFetchError(_('Failed to retrieve template from %s') % url)