StarMirror/py-libp2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #394 from NIC619/fix_closing_a_reset_connection

Browse Source 
Fix `close` an already reset connection
This commit is contained in:
NIC Lin 2019-12-26 12:13:26 +08:00 committed by GitHub
commit 4d814f0587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libp2p/network/connection/raw_connection.py
View File

@ -26,10 +26,11 @@ class RawConnection(IRawConnection):
async def write(self, data: bytes) -> None: async def write(self, data: bytes) -> None:
"""Raise `RawConnError` if the underlying connection breaks.""" """Raise `RawConnError` if the underlying connection breaks."""
try: # Detect if underlying transport is closing before write data to it
self.writer.write(data) # ref: https://github.com/ethereum/trinity/pull/614
except ConnectionResetError as error: if self.writer.transport.is_closing():
raise RawConnError(error) raise RawConnError("Transport is closing")
self.writer.write(data)
# Reference: https://github.com/ethereum/lahja/blob/93610b2eb46969ff1797e0748c7ac2595e130aef/lahja/asyncio/endpoint.py#L99-L102 # noqa: E501 # Reference: https://github.com/ethereum/lahja/blob/93610b2eb46969ff1797e0748c7ac2595e130aef/lahja/asyncio/endpoint.py#L99-L102 # noqa: E501
# Use a lock to serialize drain() calls. Circumvents this bug: # Use a lock to serialize drain() calls. Circumvents this bug:
# https://bugs.python.org/issue29930 # https://bugs.python.org/issue29930
@ -52,7 +53,13 @@ class RawConnection(IRawConnection):
raise RawConnError(error) raise RawConnError(error)
async def close(self) -> None: async def close(self) -> None:
if self.writer.transport.is_closing():
return
self.writer.close() self.writer.close()
if sys.version_info < (3, 7): if sys.version_info < (3, 7):
return return
await self.writer.wait_closed() try:
await self.writer.wait_closed()
# In case the connection is already reset.
except ConnectionResetError:
return