Check if transport is closing before write/close
This commit is contained in:
parent
a390d21385
commit
c62f1f374f
|
@ -26,10 +26,11 @@ class RawConnection(IRawConnection):
|
|||
|
||||
async def write(self, data: bytes) -> None:
|
||||
"""Raise `RawConnError` if the underlying connection breaks."""
|
||||
try:
|
||||
self.writer.write(data)
|
||||
except ConnectionResetError as error:
|
||||
raise RawConnError(error)
|
||||
# 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)
|
||||
# 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:
|
||||
# https://bugs.python.org/issue29930
|
||||
|
@ -52,6 +53,8 @@ class RawConnection(IRawConnection):
|
|||
raise RawConnError(error)
|
||||
|
||||
async def close(self) -> None:
|
||||
if self.writer.transport.is_closing():
|
||||
return
|
||||
self.writer.close()
|
||||
if sys.version_info < (3, 7):
|
||||
return
|
||||
|
|
Loading…
Reference in New Issue
Block a user