diff options
| author | Daniel G. Taylor <danielgtaylor@gmail.com> | 2014-07-01 14:38:40 -0700 |
|---|---|---|
| committer | Daniel G. Taylor <danielgtaylor@gmail.com> | 2014-07-01 14:38:40 -0700 |
| commit | 34e0dcfaa778ee469ca08ae487a0bd4021a8e0da (patch) | |
| tree | 7d541482d51480dcbec2ae7fde076fb46cae8bc2 /boto/connection.py | |
| parent | 5a6fab80b2021c588388f8819a3332454b02fe46 (diff) | |
| parent | 04e68caf661baa7b5db7471065a764f1dfd6d009 (diff) | |
| download | boto-2.30.0.tar.gz | |
Merge branch 'release-2.30.0'2.30.0
Diffstat (limited to 'boto/connection.py')
| -rw-r--r-- | boto/connection.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/boto/connection.py b/boto/connection.py index 051007df..ebe26cdc 100644 --- a/boto/connection.py +++ b/boto/connection.py @@ -901,7 +901,8 @@ class AWSAuthConnection(object): self.is_secure) while i <= num_retries: # Use binary exponential backoff to desynchronize client requests. - next_sleep = random.random() * (2 ** i) + next_sleep = min(random.random() * (2 ** i), + boto.config.get('Boto', 'max_retry_delay', 60)) try: # we now re-sign each request before it is retried boto.log.debug('Token: %s' % self.provider.security_token) |