External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 14:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6670 from ryanpetrello/redis-fixup

Browse Source 
work around redis connection failures in the callback receiver

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-09 21:41:08 +00:00
committed by GitHub
parent 19e4758be1 80147acc1c
commit a7f1a36ed8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,9 +118,14 @@ class AWXConsumerRedis(AWXConsumerBase):
queue = redis.Redis.from_url(settings.BROKER_URL) queue = redis.Redis.from_url(settings.BROKER_URL)
while True: while True:
res = queue.blpop(self.queues) try:
res = json.loads(res[1]) res = queue.blpop(self.queues)
self.process_task(res) res = json.loads(res[1])
self.process_task(res)
except redis.exceptions.RedisError:
logger.exception(f"encountered an error communicating with redis")
except (json.JSONDecodeError, KeyError):
logger.exception(f"failed to decode JSON message from redis")
if self.should_stop: if self.should_stop:
return return