RanchiMall/electrumx
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix group consolidation logic

Browse Source
This commit is contained in:
Neil Booth 2018-04-08 09:36:57 +09:00
parent fbf0ec4d9b
commit 415552989b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/controller.py
View File

@ -358,8 +358,7 @@ class Controller(ServerBase):
if len(sessions) <= 5 and if len(sessions) <= 5 and
sum(s.bw_charge for s in sessions) < bw_limit] sum(s.bw_charge for s in sessions) < bw_limit]
if len(groups) > 1: if len(groups) > 1:
new_gid = max(group.gid for group in groups) new_group = groups.pop()
new_group = self._new_group(new_gid)
for group in groups: for group in groups:
self.groups.remove(group) self.groups.remove(group)
for session in group_map[group]: for session in group_map[group]:

1
server/session.py
View File

@ -118,7 +118,6 @@ class SessionBase(ServerSession):
if msg: if msg:
msg = 'disconnected' + msg msg = 'disconnected' + msg
self.logger.info(msg) self.logger.info(msg)
self.group = None
def count_pending_items(self): def count_pending_items(self):
return self.rpc.pending_requests return self.rpc.pending_requests