From 4d02ee94459ce962476bef47bd0fb3da8f9d3bd9 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Fri, 24 Feb 2017 16:59:39 -0500
Subject: [PATCH] Make current_groups a set to easily avoid duplicates, update
 asgi-amqp requirement

---
 awx/main/consumers.py         | 8 ++++----
 requirements/requirements.in  | 2 +-
 requirements/requirements.txt | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/awx/main/consumers.py b/awx/main/consumers.py
index 6b7edcfecb..c42f16ef21 100644
--- a/awx/main/consumers.py
+++ b/awx/main/consumers.py
@@ -63,7 +63,7 @@ def ws_receive(message):
     if 'groups' in data:
         discard_groups(message)
         groups = data['groups']
-        current_groups = message.channel_session.pop('groups') if 'groups' in message.channel_session else []
+        current_groups = set(message.channel_session.pop('groups') if 'groups' in message.channel_session else [])
         for group_name,v in groups.items():
             if type(v) is list:
                 for oid in v:
@@ -74,12 +74,12 @@ def ws_receive(message):
                         if not user_access.get_queryset().filter(pk=oid).exists():
                             message.reply_channel.send({"text": json.dumps({"error": "access denied to channel {0} for resource id {1}".format(group_name, oid)})})
                             continue
-                    current_groups.append(name)
+                    current_groups.add(name)
                     Group(name).add(message.reply_channel)
             else:
-                current_groups.append(group_name)
+                current_groups.add(group_name)
                 Group(group_name).add(message.reply_channel)
-        message.channel_session['groups'] = current_groups
+        message.channel_session['groups'] = list(current_groups)
 
 
 def emit_channel_notification(group, payload):
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 723319e86f..05ef12aa63 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -4,7 +4,7 @@
 -e git+https://github.com/ansible/dm.xmlsec.binding.git@master#egg=dm.xmlsec.binding
 -e git+https://github.com/chrismeyersfsu/pyrax@tower#egg=pyrax
 apache-libcloud==1.3.0
-asgi-amqp==0.3.1
+asgi-amqp==0.4.0
 azure==2.0.0rc6
 backports.ssl-match-hostname==3.5.0.1
 boto==2.45.0
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index d413f74101..ec6bf26375 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -14,7 +14,7 @@ amqp==1.4.9               # via kombu
 anyjson==0.3.3            # via kombu
 apache-libcloud==1.3.0
 appdirs==1.4.0            # via os-client-config, python-ironicclient, rply
-asgi-amqp==0.3.1
+asgi-amqp==0.4.0
 asgiref==1.0.0            # via asgi-amqp, channels, daphne
 attrs==16.3.0             # via service-identity
 autobahn==0.17.0          # via daphne