External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-06 03:01:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

actually do exponential calc rather than *2

Browse Source 
* Log the time til reconnect attemp to log message rather than attempt
number
This commit is contained in:
chris meyers
2020-04-28 12:41:47 -04:00
parent 2ecd055d1e
commit a8f52c1639
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/dispatch/worker/base.py
View File

@@ -117,19 +117,19 @@ class AWXConsumerRedis(AWXConsumerBase):
super(AWXConsumerRedis, self).run(*args, **kwargs) super(AWXConsumerRedis, self).run(*args, **kwargs)
self.worker.on_start() self.worker.on_start()
retry = 0 time_to_sleep = 1
while True: while True:
queue = redis.Redis.from_url(settings.BROKER_URL) queue = redis.Redis.from_url(settings.BROKER_URL)
while True: while True:
try: try:
res = queue.blpop(self.queues) res = queue.blpop(self.queues)
retry = 0 time_to_sleep = 1
res = json.loads(res[1]) res = json.loads(res[1])
self.process_task(res) self.process_task(res)
except redis.exceptions.RedisError: except redis.exceptions.RedisError:
logger.exception(f"encountered an error communicating with redis. Reconnect attempt {retry}") time_to_sleep = min(time_to_sleep*2, 30)
retry += 1 logger.exception(f"encountered an error communicating with redis. Reconnect attempt in {time_to_sleep} seconds")
time.sleep(min(retry * 2, 30)) time.sleep(time_to_sleep)
except (json.JSONDecodeError, KeyError): except (json.JSONDecodeError, KeyError):
logger.exception("failed to decode JSON message from redis") logger.exception("failed to decode JSON message from redis")
if self.should_stop: if self.should_stop: