vacp2p
/
nim-libp2p
mirror of https://github.com/vacp2p/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

work around send that may raise 

`send` can raise exceptions that together with asyncCheck will
crash NBC
This commit is contained in:
Jacek Sieka 2020-08-19 12:28:18 +02:00 committed by zah
parent af0955c58b
commit eb13845f65
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libp2p/protocols/pubsub/pubsub.nim
View File

@ -8,7 +8,7 @@
## those terms. ## those terms.
import std/[tables, sequtils, sets] import std/[tables, sequtils, sets]
import chronos, chronicles, metrics import chronos, chronicles, chronicles/chronos_tools, metrics
import pubsubpeer, import pubsubpeer,
rpc/[message, messages], rpc/[message, messages],
../../switch, ../../switch,
@ -107,9 +107,9 @@ proc broadcast*(
proc sendSubs*(p: PubSub, proc sendSubs*(p: PubSub,
peer: PubSubPeer, peer: PubSubPeer,
topics: seq[string], topics: seq[string],
subscribe: bool) {.async.} = subscribe: bool): Future[void] =
## send subscriptions to remote peer ## send subscriptions to remote peer
await p.send( p.send(
peer, peer,
RPCMsg( RPCMsg(
subscriptions: topics.mapIt(SubOpts(subscribe: subscribe, topic: it))), subscriptions: topics.mapIt(SubOpts(subscribe: subscribe, topic: it))),
@ -197,7 +197,11 @@ method subscribePeer*(p: PubSub, peer: PeerID) {.base.} =
let pubsubPeer = p.getOrCreatePeer(peer, p.codec) let pubsubPeer = p.getOrCreatePeer(peer, p.codec)
if p.topics.len > 0: if p.topics.len > 0:
asyncCheck p.sendSubs(pubsubPeer, toSeq(p.topics.keys), true) # TODO sendSubs may raise, but doing asyncCheck here causes the exception
# to escape to the poll loop.
# With a bit of luck, it may be harmless to ignore exceptions here -
# some cleanup is eventually done in PubSubPeer.send
traceAsyncErrors p.sendSubs(pubsubPeer, toSeq(p.topics.keys), true)
pubsubPeer.subscribed = true pubsubPeer.subscribed = true