valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

INFRA-5461 - Use the same var name in both places, Tom :)

Browse Source
This commit is contained in:
Tom Williams 2017-09-20 21:10:44 -04:00
parent 45096a5d56
commit d2106f79bb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/modules/boto_elb.py
View File

@ -536,13 +536,13 @@ def get_attributes(name, region=None, key=None, keyid=None, profile=None):
ret['connection_draining']['timeout'] = cd.timeout
ret['connecting_settings']['idle_timeout'] = cs.idle_timeout
return ret
except boto.exception.BotoServerError as error:
except boto.exception.BotoServerError as e:
if e.error_code == 'Throttling':
log.debug("Throttled by AWS API, will retry in 5 seconds...")
time.sleep(5)
retries -= 1
continue
log.error('ELB {0} does not exist: {1}'.format(name, error.message))
log.error('ELB {0} does not exist: {1}'.format(name, e.message))
return {}
return {}