From 415552989b55bb88983a87409963d1e24209fa92 Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Sun, 8 Apr 2018 09:36:57 +0900
Subject: [PATCH] Fix group consolidation logic

---
 server/controller.py | 3 +--
 server/session.py    | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/server/controller.py b/server/controller.py
index 3d9d278..42e78c9 100644
--- a/server/controller.py
+++ b/server/controller.py
@@ -358,8 +358,7 @@ class Controller(ServerBase):
                   if len(sessions) <= 5 and
                   sum(s.bw_charge for s in sessions) < bw_limit]
         if len(groups) > 1:
-            new_gid = max(group.gid for group in groups)
-            new_group = self._new_group(new_gid)
+            new_group = groups.pop()
             for group in groups:
                 self.groups.remove(group)
                 for session in group_map[group]:
diff --git a/server/session.py b/server/session.py
index 87567d1..d42a582 100644
--- a/server/session.py
+++ b/server/session.py
@@ -118,7 +118,6 @@ class SessionBase(ServerSession):
         if msg:
             msg = 'disconnected' + msg
             self.logger.info(msg)
-        self.group = None
 
     def count_pending_items(self):
         return self.rpc.pending_requests