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

Merge pull request #6739 from chrismeyersfsu/fix-redis_group_cleanup

Browse Source 
cleanup group membership on disconnect

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-17 20:28:00 +00:00
committed by GitHub
parent 8954e6e556 fd068695ef
commit b1a90d445b
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/main/consumers.py
View File

@@ -108,6 +108,7 @@ class BroadcastConsumer(AsyncJsonWebsocketConsumer):
async def disconnect(self, code): async def disconnect(self, code):
# TODO: log ip of disconnected client # TODO: log ip of disconnected client
logger.info("Client disconnected") logger.info("Client disconnected")
await self.channel_layer.group_discard(settings.BROADCAST_WEBSOCKET_GROUP_NAME, self.channel_name)
async def internal_message(self, event): async def internal_message(self, event):
await self.send(event['text']) await self.send(event['text'])
@@ -132,6 +133,14 @@ class EventConsumer(AsyncJsonWebsocketConsumer):
await self.send_json({"close": True}) await self.send_json({"close": True})
await self.close() await self.close()
async def disconnect(self, code):
current_groups = set(self.scope['session'].pop('groups') if 'groups' in self.scope['session'] else [])
for group_name in current_groups:
await self.channel_layer.group_discard(
group_name,
self.channel_name,
)
@database_sync_to_async @database_sync_to_async
def user_can_see_object_id(self, user_access, oid): def user_can_see_object_id(self, user_access, oid):
# At this point user is a channels.auth.UserLazyObject object # At this point user is a channels.auth.UserLazyObject object