better exceptions

This commit is contained in:
Dmitriy Ryajov 2020-05-23 11:10:22 -06:00
parent 95774b2b81
commit 7ff76d76b6
1 changed files with 8 additions and 8 deletions

View File

@ -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
warn "no handlers for ", protocol = ms
await conn.write(Na)
except CatchableError as exc:
trace "exception in multistream", exc = exc.msg
finally:
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
proc addHandler*[T: LPProtocol](m: MultistreamSelect,
codec: string,