From 850934c89d3627b1bf7a0e4f0428eac45a904200 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Wed, 24 Aug 2016 10:52:47 -0400
Subject: [PATCH] remove reply_channel from groups

---
 Procfile              |  1 -
 awx/main/consumers.py | 10 +++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Procfile b/Procfile
index 433417f70b..6af685e88f 100644
--- a/Procfile
+++ b/Procfile
@@ -2,6 +2,5 @@ runserver:      make runserver
 celeryd:        make celeryd
 taskmanager:    make taskmanager
 receiver:       make receiver
-socketservice:  make socketservice
 factcacher:     make factcacher
 flower:         make flower
\ No newline at end of file
diff --git a/awx/main/consumers.py b/awx/main/consumers.py
index 23ca874ed0..8b02f53d87 100644
--- a/awx/main/consumers.py
+++ b/awx/main/consumers.py
@@ -4,18 +4,22 @@ from channels import Group
 from channels.sessions import channel_session
 
 
-@channel_session
-def ws_disconnect(message):
+def discard_groups(message):
     for group in message.channel_session['groups']:
         print("removing from group: {}".format(group))
         Group(group).discard(message.reply_channel)
 
+@channel_session
+def ws_disconnect(message):
+    discard_groups(message)
+
 @channel_session
 def ws_receive(message):
     raw_data = message.content['text']
     data = json.loads(raw_data)
 
     if 'groups' in data:
+        discard_groups(message)
         groups = data['groups']
         current_groups = message.channel_session.pop('groups') if 'groups' in message.channel_session else []
         for group_name,v in groups.items():
@@ -27,7 +31,7 @@ def ws_receive(message):
                     Group(name).add(message.reply_channel)
             else:
                 print("listening to group: {}".format(group_name))
-                current_groups.append(name)
+                current_groups.append(group_name)
                 Group(group_name).add(message.reply_channel)
         message.channel_session['groups'] = current_groups