opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-07-01 02:30:39 +08:00
Code Issues Projects Releases Wiki Activity

core bugfix -- connect ctx

Browse Source
This commit is contained in:
Juan Batiz-Benet
2014-09-21 19:17:32 -07:00
committed by Brian Tiger Chow
parent 52cefb16cd
commit 8d29a3255f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/core.go
View File

@ -121,7 +121,7 @@ func NewIpfsNode(cfg *config.Config, online bool) (*IpfsNode, error) {
exchangeSession = bitswap.NetMessageSession(ctx, exchangeService, local, d, route) exchangeSession = bitswap.NetMessageSession(ctx, exchangeService, local, d, route)
// TODO(brian): pass a context to initConnections // TODO(brian): pass a context to initConnections
go initConnections(cfg, peerstore, route) go initConnections(ctx, cfg, peerstore, route)
} }
// TODO(brian): when offline instantiate the BlockService with a bitswap // TODO(brian): when offline instantiate the BlockService with a bitswap
@ -184,7 +184,7 @@ func initIdentity(cfg *config.Config) (*peer.Peer, error) {
}, nil }, nil
} }
func initConnections(cfg *config.Config, pstore peer.Peerstore, route *dht.IpfsDHT) { func initConnections(ctx context.Context, cfg *config.Config, pstore peer.Peerstore, route *dht.IpfsDHT) {
for _, p := range cfg.Peers { for _, p := range cfg.Peers {
if p.PeerID == "" { if p.PeerID == "" {
u.PErr("error: peer does not include PeerID. %v\n", p) u.PErr("error: peer does not include PeerID. %v\n", p)
@ -205,7 +205,7 @@ func initConnections(cfg *config.Config, pstore peer.Peerstore, route *dht.IpfsD
continue continue
} }
if _, err = route.Connect(npeer); err != nil { if _, err = route.Connect(ctx, npeer); err != nil {
u.PErr("Bootstrapping error: %v\n", err) u.PErr("Bootstrapping error: %v\n", err)
} }
} }