summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kombu/async/http/curl.py2
-rw-r--r--kombu/utils/scheduling.py8
2 files changed, 3 insertions, 7 deletions
diff --git a/kombu/async/http/curl.py b/kombu/async/http/curl.py
index 5200493d..1c50eef8 100644
--- a/kombu/async/http/curl.py
+++ b/kombu/async/http/curl.py
@@ -178,8 +178,8 @@ class CurlClient(BaseClient):
buffer=buffer, effective_url=effective_url, error=error,
))
except Exception as exc:
- raise
self.hub.on_callback_error(request.on_ready, exc)
+ raise
def _setup_request(self, curl, request, buffer, headers, _pycurl=pycurl):
setopt = curl.setopt
diff --git a/kombu/utils/scheduling.py b/kombu/utils/scheduling.py
index d75710d1..0cee9e80 100644
--- a/kombu/utils/scheduling.py
+++ b/kombu/utils/scheduling.py
@@ -50,18 +50,14 @@ class FairCycle(object):
def get(self, callback, **kwargs):
"""Get from next resource."""
- succeeded = 0
for tried in count(0): # for infinity
resource = self._next()
try:
return self.fun(resource, callback, **kwargs)
except self.predicate:
+ # reraise when retries exchausted.
if tried >= len(self.resources) - 1:
- if not succeeded:
- raise
- break
- else:
- succeeded += 1
+ raise
def close(self):
"""Close cycle."""