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

Fix prior; can't spawn a close() call

Browse Source
This commit is contained in:
Neil Booth 2018-11-05 18:41:08 -04:00
parent c65ad772e9
commit e2d583dd14
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
electrumx/server/session.py
View File

@ -262,8 +262,9 @@ class SessionManager(object):
for session in stale_sessions) for session in stale_sessions)
self.logger.info(f'closing stale connections {text}') self.logger.info(f'closing stale connections {text}')
# Give the sockets some time to close gracefully # Give the sockets some time to close gracefully
for session in stale_sessions: async with TaskGroup() as group:
await session.spawn(session.close()) for session in stale_sessions:
await group.spawn(session.close())
# Consolidate small groups # Consolidate small groups
bw_limit = self.env.bandwidth_limit bw_limit = self.env.bandwidth_limit
@ -288,7 +289,7 @@ class SessionManager(object):
'errors': sum(s.errors for s in self.sessions), 'errors': sum(s.errors for s in self.sessions),
'groups': len(group_map), 'groups': len(group_map),
'logged': len([s for s in self.sessions if s.log_me]), 'logged': len([s for s in self.sessions if s.log_me]),
'paused': sum(not s.can_send.is_set() for s in self.sessions), 'paused': sum(not s._can_send.is_set() for s in self.sessions),
'pid': os.getpid(), 'pid': os.getpid(),
'peers': self.peer_mgr.info(), 'peers': self.peer_mgr.info(),
'requests': sum(s.count_pending_items() for s in self.sessions), 'requests': sum(s.count_pending_items() for s in self.sessions),
@ -511,8 +512,9 @@ class SessionManager(object):
finally: finally:
# Close servers and sessions # Close servers and sessions
await self._close_servers(list(self.servers.keys())) await self._close_servers(list(self.servers.keys()))
for session in self.sessions: async with TaskGroup() as group:
await session.spawn(session.close(force_after=1)) for session in self.sessions:
await group.spawn(session.close(force_after=1))
def session_count(self): def session_count(self):
'''The number of connections that we've sent something to.''' '''The number of connections that we've sent something to.'''