openstack/python-swiftclient
Code Issues Proposed changes

Merge "Fixes re-auth flow with expired tokens."

Browse Source
This commit is contained in:
Jenkins
2013-06-19 18:31:15 +00:00
committed by Gerrit Code Review
parent 08e1f09e58 7b9f304485
commit 5d84ff8d9b
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
swiftclient/client.py
View File

@@ -1034,6 +1034,7 @@ class Connection(object):
def _retry(self, reset_func, func, *args, **kwargs): def _retry(self, reset_func, func, *args, **kwargs):
self.attempts = 0 self.attempts = 0
retried_auth = False
backoff = self.starting_backoff backoff = self.starting_backoff
while self.attempts <= self.retries: while self.attempts <= self.retries:
self.attempts += 1 self.attempts += 1
@@ -1055,10 +1056,11 @@ class Connection(object):
raise raise
if err.http_status == 401: if err.http_status == 401:
self.url = self.token = None self.url = self.token = None
if self.attempts > 1 or not all((self.authurl, if retried_auth or not all((self.authurl,
self.user, self.user,
self.key)): self.key)):
raise raise
retried_auth = True
elif err.http_status == 408: elif err.http_status == 408:
self.http_conn = None self.http_conn = None
elif 500 <= err.http_status <= 599: elif 500 <= err.http_status <= 599: