提交 fcf915fc 作者: rht

Define discoveryConnTimeout and set it to 30s

License: MIT
Signed-off-by: 's avatarrht <rhtbot@gmail.com>
上级 a7202fa9
...@@ -39,8 +39,8 @@ import ( ...@@ -39,8 +39,8 @@ import (
routing "github.com/ipfs/go-ipfs/routing" routing "github.com/ipfs/go-ipfs/routing"
dht "github.com/ipfs/go-ipfs/routing/dht" dht "github.com/ipfs/go-ipfs/routing/dht"
kb "github.com/ipfs/go-ipfs/routing/kbucket" kb "github.com/ipfs/go-ipfs/routing/kbucket"
offroute "github.com/ipfs/go-ipfs/routing/offline"
nilrouting "github.com/ipfs/go-ipfs/routing/none" nilrouting "github.com/ipfs/go-ipfs/routing/none"
offroute "github.com/ipfs/go-ipfs/routing/offline"
bstore "github.com/ipfs/go-ipfs/blocks/blockstore" bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
bserv "github.com/ipfs/go-ipfs/blockservice" bserv "github.com/ipfs/go-ipfs/blockservice"
...@@ -63,6 +63,7 @@ import ( ...@@ -63,6 +63,7 @@ import (
const IpnsValidatorTag = "ipns" const IpnsValidatorTag = "ipns"
const kSizeBlockstoreWriteCache = 100 const kSizeBlockstoreWriteCache = 100
const kReprovideFrequency = time.Hour * 12 const kReprovideFrequency = time.Hour * 12
const discoveryConnTimeout = time.Second * 30
var log = eventlog.Logger("core") var log = eventlog.Logger("core")
...@@ -320,7 +321,7 @@ func setupDiscoveryOption(d config.Discovery) DiscoveryOption { ...@@ -320,7 +321,7 @@ func setupDiscoveryOption(d config.Discovery) DiscoveryOption {
func (n *IpfsNode) HandlePeerFound(p peer.PeerInfo) { func (n *IpfsNode) HandlePeerFound(p peer.PeerInfo) {
log.Warning("trying peer info: ", p) log.Warning("trying peer info: ", p)
ctx, cancel := context.WithTimeout(n.Context(), time.Second*10) ctx, cancel := context.WithTimeout(n.Context(), discoveryConnTimeout)
defer cancel() defer cancel()
if err := n.PeerHost.Connect(ctx, p); err != nil { if err := n.PeerHost.Connect(ctx, p); err != nil {
log.Warning("Failed to connect to peer found by discovery: ", err) log.Warning("Failed to connect to peer found by discovery: ", err)
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论