logos-storage/nim-libp2p
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-libp2p.git synced 2026-01-05 23:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

use cancelAndAwait to mitigate further hangs (#459)

Browse Source
This commit is contained in:
Dmitriy Ryajov 2020-11-28 09:48:06 -06:00 committed by GitHub
parent a8f5f7a8bb
commit 3d44fcb8b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libp2p/protocols/secure/secure.nim
View File

@ -81,7 +81,7 @@ proc handleConn*(s: Secure,
let futs = @[conn.join(), sconn.join()] let futs = @[conn.join(), sconn.join()]
await futs[0] or futs[1] await futs[0] or futs[1]
for f in futs: for f in futs:
if not f.finished: f.cancel # cancel outstanding join() if not f.finished: await f.cancelAndWait() # cancel outstanding join()
await allFuturesThrowing( await allFuturesThrowing(
sconn.close(), conn.close()) sconn.close(), conn.close())

2
libp2p/transports/tcptransport.nim
View File

@ -88,7 +88,7 @@ proc connHandler*(t: TcpTransport,
let futs = @[client.join(), conn.join()] let futs = @[client.join(), conn.join()]
await futs[0] or futs[1] await futs[0] or futs[1]
for f in futs: for f in futs:
if not f.finished: f.cancel # cancel outstanding join() if not f.finished: await f.cancelAndWait() # cancel outstanding join()
trace "Cleaning up client", addrs = $client.remoteAddress, trace "Cleaning up client", addrs = $client.remoteAddress,
conn conn