From 7ff76d76b6ef716fc79686040932423c1266b6ec Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Sat, 23 May 2020 11:10:22 -0600 Subject: [PATCH] better exceptions --- libp2p/multistream.nim | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libp2p/multistream.nim b/libp2p/multistream.nim index 30cc60d3a..15fbe7347 100644 --- a/libp2p/multistream.nim +++ b/libp2p/multistream.nim @@ -39,7 +39,7 @@ type MultistreamHandshakeException* = object of CatchableError -proc newMultistreamHandshakeException*(): ref Exception {.inline.} = +proc newMultistreamHandshakeException*(): ref CatchableError {.inline.} = result = newException(MultistreamHandshakeException, "could not perform multistream handshake") @@ -113,7 +113,7 @@ proc list*(m: MultistreamSelect, proc handle*(m: MultistreamSelect, conn: Connection) {.async, gcsafe.} = trace "handle: starting multistream handling" - tryAndWarn "multistream handle": + try: while not conn.closed: var ms = string.fromBytes(await conn.readLp(1024)) ms.removeSuffix("\n") @@ -142,14 +142,14 @@ proc handle*(m: MultistreamSelect, conn: Connection) {.async, gcsafe.} = if (not isNil(h.match) and h.match(ms)) or ms == h.proto: trace "found handler for", protocol = ms await conn.writeLp((h.proto & "\n")) - tryAndWarn "multistream handle handler": - await h.protocol.handler(conn, ms) - return + await h.protocol.handler(conn, ms) + return warn "no handlers for ", protocol = ms await conn.write(Na) - trace "leaving multistream loop" - # we might be tempted to close conn here but that would be a bad idea! - # we indeed will reuse it later on + except CatchableError as exc: + trace "exception in multistream", exc = exc.msg + finally: + trace "leaving multistream loop" proc addHandler*[T: LPProtocol](m: MultistreamSelect, codec: string,