status-im
/
nim-libp2p
mirror of https://github.com/status-im/nim-libp2p.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Track all connections (#175) 

* adding to do for future refactor

* no mix conn and transport stopping or it will race

* don't use intermediary vars
This commit is contained in:
Dmitriy Ryajov 2020-05-18 09:08:10 -06:00 committed by GitHub
parent 1819502fb5
commit 5583168965
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libp2p/switch.nim
View File

@ -335,16 +335,16 @@ proc stop*(s: Switch) {.async.} =
# we want to report erros but we do not want to fail # we want to report erros but we do not want to fail
# or crash here, cos we need to clean possibly MANY items # or crash here, cos we need to clean possibly MANY items
# and any following conn/transport won't be cleaned up # and any following conn/transport won't be cleaned up
var futs = newSeq[Future[void]]()
if s.pubSub.isSome: if s.pubSub.isSome:
futs &= s.pubSub.get().stop() await s.pubSub.get().stop()
futs &= toSeq(s.connections.values).mapIt(s.cleanupConn(it)) checkFutures(
futs &= s.transports.mapIt(it.close()) await allFinished(
toSeq(s.connections.values).mapIt(s.cleanupConn(it))))
futs = await allFinished(futs) checkFutures(
checkFutures(futs) await allFinished(
s.transports.mapIt(it.close())))
trace "switch stopped" trace "switch stopped"

5
libp2p/transports/tcptransport.nim
View File

@ -71,8 +71,9 @@ proc connHandler*(t: TcpTransport,
if not isNil(t.handler): if not isNil(t.handler):
t.handlers &= t.handler(conn) t.handlers &= t.handler(conn)
t.connections.add(conn) # TODO: store the streamtransport client here
t.cleanups &= t.cleanup(conn) t.connections.add(conn)
t.cleanups &= t.cleanup(conn)
result = conn result = conn