From e6d8fc5e581b7ab4830eb9005ca10cecf02d3636 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Sat, 16 Jun 2012 19:38:41 -0700
Subject: Capture the exceptions and just re-throw the last one on errors
---
cloudinit/url_helper.py | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index 7ae0226a..18686686 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -60,7 +60,7 @@ def readurl(url, data=None, timeout=None,
retries = max(retries, 0)
attempts = retries + 1
- last_excp = Exception("??")
+ excepts = []
LOG.info(("Attempting to read from %s with %s attempts"
" (%s retries) to be performed"), url, attempts, retries)
open_args = {}
@@ -78,16 +78,16 @@ def readurl(url, data=None, timeout=None,
url, status, len(content), (i + 1))
return (content, status)
except urllib2.HTTPError as e:
- last_excp = e
+ excepts.append(e)
except urllib2.URLError as e:
# This can be a message string or
# another exception instance
# (socket.error for remote URLs, OSError for local URLs).
if (isinstance(e.reason, (OSError)) and
e.reason.errno == errno.ENOENT):
- last_excp = e.reason
+ excepts.append(e.reason)
else:
- last_excp = e
+ excepts.append(e)
if i + 1 < attempts:
LOG.debug("Please wait %s seconds while we wait to try again",
sec_between)
@@ -95,7 +95,11 @@ def readurl(url, data=None, timeout=None,
# Didn't work out
LOG.warn("Failed reading from %s after %s attempts", url, attempts)
- raise last_excp
+
+ # It must of errored at least once for code
+ # to get here so re-raise the last error
+ LOG.debug("%s errors occured, re-raising the last one", len(excepts))
+ raise excepts[-1]
def wait_for_url(urls, max_wait=None, timeout=None,
--
cgit v1.2.3