Skip to content

Commit 207ea24

Browse files
committed
Finally!
1 parent 81e7012 commit 207ea24

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

async_substrate_interface/async_substrate.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ def __init__(
561561
self._received: dict[str, asyncio.Future] = {}
562562
self._received_subscriptions: dict[str, asyncio.Queue] = {}
563563
self._sending: Optional[asyncio.Queue] = None
564-
self._send_recv_task = None
564+
self._send_recv_task: Optional[asyncio.Task] = None
565565
self._inflight: dict[str, str] = {}
566566
self._attempts = 0
567567
self._lock = asyncio.Lock()
@@ -747,7 +747,7 @@ async def _start_receiving(self, ws: ClientConnection) -> Exception:
747747
elif isinstance(e, websockets.exceptions.ConnectionClosedOK):
748748
logger.debug("Websocket connection closed.")
749749
else:
750-
logger.debug(f"Timeout occurred. Reconnecting.")
750+
logger.debug(f"Timeout occurred.")
751751
return e
752752

753753
async def _start_sending(self, ws) -> Exception:
@@ -780,7 +780,7 @@ async def _start_sending(self, ws) -> Exception:
780780
elif isinstance(e, websockets.exceptions.ConnectionClosedOK):
781781
logger.debug("Websocket connection closed.")
782782
else:
783-
logger.debug("Timeout occurred. Reconnecting.")
783+
logger.debug("Timeout occurred.")
784784
return e
785785

786786
async def send(self, payload: dict) -> str:
@@ -856,7 +856,10 @@ async def retrieve(self, item_id: str) -> Optional[dict]:
856856
pass
857857
if self._send_recv_task is not None and self._send_recv_task.done():
858858
if not self._send_recv_task.cancelled():
859-
if isinstance((e := self._send_recv_task.exception()), Exception):
859+
if isinstance((e := self._send_recv_task.result()), Exception):
860+
logger.exception(f"Websocket sending exception: {e}")
861+
raise e
862+
elif isinstance((e := self._send_recv_task.result()), Exception):
860863
logger.exception(f"Websocket sending exception: {e}")
861864
raise e
862865
await asyncio.sleep(0.1)

0 commit comments

Comments
 (0)