Raise RawConnError
in RawConnection
This commit is contained in:
parent
cb632fa509
commit
4cd5b77f10
|
@ -1,5 +1,6 @@
|
||||||
import asyncio
|
import asyncio
|
||||||
|
|
||||||
|
from .exceptions import RawConnError
|
||||||
from .raw_connection_interface import IRawConnection
|
from .raw_connection_interface import IRawConnection
|
||||||
|
|
||||||
|
|
||||||
|
@ -23,19 +24,28 @@ class RawConnection(IRawConnection):
|
||||||
self._drain_lock = asyncio.Lock()
|
self._drain_lock = asyncio.Lock()
|
||||||
|
|
||||||
async def write(self, data: bytes) -> None:
|
async def write(self, data: bytes) -> None:
|
||||||
self.writer.write(data)
|
try:
|
||||||
|
self.writer.write(data)
|
||||||
|
except ConnectionResetError:
|
||||||
|
raise RawConnError()
|
||||||
# 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
|
||||||
async with self._drain_lock:
|
async with self._drain_lock:
|
||||||
await self.writer.drain()
|
try:
|
||||||
|
await self.writer.drain()
|
||||||
|
except ConnectionResetError:
|
||||||
|
raise RawConnError()
|
||||||
|
|
||||||
async def read(self, n: int = -1) -> bytes:
|
async def read(self, n: int = -1) -> bytes:
|
||||||
"""
|
"""
|
||||||
Read up to ``n`` bytes from the underlying stream.
|
Read up to ``n`` bytes from the underlying stream.
|
||||||
This call is delegated directly to the underlying ``self.reader``.
|
This call is delegated directly to the underlying ``self.reader``.
|
||||||
"""
|
"""
|
||||||
return await self.reader.read(n)
|
try:
|
||||||
|
return await self.reader.read(n)
|
||||||
|
except ConnectionResetError:
|
||||||
|
raise RawConnError()
|
||||||
|
|
||||||
async def close(self) -> None:
|
async def close(self) -> None:
|
||||||
self.writer.close()
|
self.writer.close()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user