varun-r-mallya/py-libp2p
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/py-libp2p.git synced 2026-02-12 16:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mplex: only close the send of new stream channel

Browse Source
This commit is contained in:
mhchia
2020-02-05 21:41:28 +08:00
parent b7c2ec2187
commit 5b03a7ad9f
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libp2p/stream_muxer/mplex/mplex.py
View File

@ -137,7 +137,7 @@ class Mplex(IMuxedConn):
"""accepts a muxed stream opened by the other end.""" """accepts a muxed stream opened by the other end."""
try: try:
return await self.new_stream_receive_channel.receive() return await self.new_stream_receive_channel.receive()
except (trio.ClosedResourceError, trio.EndOfChannel): except trio.EndOfChannel:
raise MplexUnavailable raise MplexUnavailable
async def send_message( async def send_message(
@ -254,7 +254,7 @@ class Mplex(IMuxedConn):
mplex_stream = await self._initialize_stream(stream_id, message.decode()) mplex_stream = await self._initialize_stream(stream_id, message.decode())
try: try:
await self.new_stream_send_channel.send(mplex_stream) await self.new_stream_send_channel.send(mplex_stream)
except (trio.BrokenResourceError, trio.ClosedResourceError): except trio.ClosedResourceError:
raise MplexUnavailable raise MplexUnavailable
async def _handle_message(self, stream_id: StreamID, message: bytes) -> None: async def _handle_message(self, stream_id: StreamID, message: bytes) -> None:
@ -336,6 +336,4 @@ class Mplex(IMuxedConn):
send_channel = self.streams_msg_channels[stream_id] send_channel = self.streams_msg_channels[stream_id]
await send_channel.aclose() await send_channel.aclose()
self.event_closed.set() self.event_closed.set()
# FIXME: It's enough to just close one side.
await self.new_stream_send_channel.aclose() await self.new_stream_send_channel.aclose()
await self.new_stream_receive_channel.aclose()