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

Use close from aiorpcX 0.7.0

Browse Source
This commit is contained in:
Neil Booth 2018-08-08 12:04:49 +09:00
parent 962b4679d7
commit 6697614427
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
electrumx/server/session.py
View File

@ -252,7 +252,7 @@ class SessionManager(object):
# Give the sockets some time to close gracefully # Give the sockets some time to close gracefully
async with TaskGroup() as group: async with TaskGroup() as group:
for session in stale_sessions: for session in stale_sessions:
await group.spawn(session.close(force_after=30)) await group.spawn(session.close())
# Consolidate small groups # Consolidate small groups
bw_limit = self.env.bandwidth_limit bw_limit = self.env.bandwidth_limit
@ -441,7 +441,7 @@ class SessionManager(object):
await self._close_servers(list(self.servers.keys())) await self._close_servers(list(self.servers.keys()))
async with TaskGroup() as group: async with TaskGroup() as group:
for session in list(self.sessions): for session in list(self.sessions):
await group.spawn(session.close(force_after=0.1)) 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.'''
@ -587,13 +587,6 @@ class SessionBase(ServerSession):
def sub_count(self): def sub_count(self):
return 0 return 0
# FIXME: make this the aiorpcx API for version 0.7
async def close(self, force_after=30):
'''Close the connection and return when closed.'''
async with ignore_after(force_after):
await super().close()
self.abort()
async def handle_request(self, request): async def handle_request(self, request):
'''Handle an incoming request. ElectrumX doesn't receive '''Handle an incoming request. ElectrumX doesn't receive
notifications from client sessions. notifications from client sessions.