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

Check if transport is closing before write/close

Browse Source
This commit is contained in:
NIC619 2019-12-24 22:23:38 +08:00
parent a390d21385
commit c62f1f374f
No known key found for this signature in database
GPG Key ID: 570C35F5C2D51B17
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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
# ref: https://github.com/ethereum/trinity/pull/614
if self.writer.transport.is_closing():
raise ConnectionResetError("Transport is closing")
self.writer.write(data) self.writer.write(data)
except ConnectionResetError as error:
raise RawConnError(error)
# 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,6 +53,8 @@ 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