Define discoveryConnTimeout and set it to 30s
License: MIT Signed-off-by: rht <rhtbot@gmail.com>
rht committed
Aug 23, 2015 at 19:37 UTC
fcf915fc4712566973cff2adac39e6f33ec56c84
1 file changed
+3
-2
core/core.go
+3
-2
@@ -39,8 +39,8 @@ import (
39
routing "github.com/ipfs/go-ipfs/routing"
40
dht "github.com/ipfs/go-ipfs/routing/dht"
41
kb "github.com/ipfs/go-ipfs/routing/kbucket"
42
- offroute "github.com/ipfs/go-ipfs/routing/offline"
42
nilrouting "github.com/ipfs/go-ipfs/routing/none"
43
+ offroute "github.com/ipfs/go-ipfs/routing/offline"
44
45
bstore "github.com/ipfs/go-ipfs/blocks/blockstore"
46
bserv "github.com/ipfs/go-ipfs/blockservice"
@@ -63,6 +63,7 @@ import (
63
const IpnsValidatorTag = "ipns"
64
const kSizeBlockstoreWriteCache = 100
65
const kReprovideFrequency = time.Hour * 12
66
+const discoveryConnTimeout = time.Second * 30
67
68
var log = eventlog.Logger("core")
69
@@ -320,7 +321,7 @@ func setupDiscoveryOption(d config.Discovery) DiscoveryOption {
321
322
func (n *IpfsNode) HandlePeerFound(p peer.PeerInfo) {
323
log.Warning("trying peer info: ", p)
323
- ctx, cancel := context.WithTimeout(n.Context(), time.Second*10)
324
+ ctx, cancel := context.WithTimeout(n.Context(), discoveryConnTimeout)
325
defer cancel()
326
if err := n.PeerHost.Connect(ctx, p); err != nil {
327
log.Warning("Failed to connect to peer found by discovery: ", err)