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

making the daemon shutdown quicker

Browse Source 
License: MIT
Signed-off-by: Jeromy <jeromyj@gmail.com>
This commit is contained in:
Jeromy
2015-07-14 14:04:56 -07:00
parent 498e927ac7
commit 191ac62c12
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
exchange/bitswap/wantmanager.go
View File

@ -140,6 +140,8 @@ func (mq *msgQueue) runQueue(ctx context.Context) {
mq.doWork(ctx) mq.doWork(ctx)
case <-mq.done: case <-mq.done:
return return
case <-ctx.Done():
return
} }
} }
} }

16
p2p/host/basic/natmgr.go
View File

@ -75,18 +75,22 @@ func (nmgr *natManager) discoverNAT() {
// to avoid leaking resources in a non-obvious way. the only case // to avoid leaking resources in a non-obvious way. the only case
// this affects is when the daemon is being started up and _immediately_ // this affects is when the daemon is being started up and _immediately_
// asked to close. other services are also starting up, so ok to wait. // asked to close. other services are also starting up, so ok to wait.
nat := inat.DiscoverNAT() discoverdone := make(chan struct{})
if nat == nil { // no nat, or failed to get it. var nat *inat.NAT
return go func() {
} defer close(discoverdone)
nat = inat.DiscoverNAT()
}()
// by this point -- after finding the NAT -- we may have already // by this point -- after finding the NAT -- we may have already
// be closing. if so, just exit. // be closing. if so, just exit.
select { select {
case <-worker.Closing(): case <-worker.Closing():
nat.Close()
return return
default: case <-discoverdone:
if nat == nil { // no nat, or failed to get it.
return
}
} }
// wire up the nat to close when nmgr closes. // wire up the nat to close when nmgr closes.

2
p2p/net/swarm/swarm.go
View File

@ -187,7 +187,7 @@ func (s *Swarm) NewStreamWithPeer(p peer.ID) (*Stream, error) {
// if we have no connections, try connecting. // if we have no connections, try connecting.
if len(s.ConnectionsToPeer(p)) == 0 { if len(s.ConnectionsToPeer(p)) == 0 {
log.Debug("Swarm: NewStreamWithPeer no connections. Attempting to connect...") log.Debug("Swarm: NewStreamWithPeer no connections. Attempting to connect...")
if _, err := s.Dial(context.Background(), p); err != nil { if _, err := s.Dial(s.Context(), p); err != nil {
return nil, err return nil, err
} }
} }