making the daemon shutdown quicker

exchange/bitswap/wantmanager.go

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

p2p/host/basic/natmgr.go

@@ -75,18 +75,22 @@ func (nmgr *natManager) discoverNAT() {
  // to avoid leaking resources in a non-obvious way. the only case
  // 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.
- nat := inat.DiscoverNAT()
- if nat == nil { // no nat, or failed to get it.
- return
- }
+ discoverdone := make(chan struct{})
+ var nat *inat.NAT
+ go func() {
+ defer close(discoverdone)
+ nat = inat.DiscoverNAT()
+ }()
 
  // by this point -- after finding the NAT -- we may have already
  // be closing. if so, just exit.
  select {
  case <-worker.Closing():
- nat.Close()
  return
- default:
+ case <-discoverdone:
+ if nat == nil { // no nat, or failed to get it.
+ return
+ }
  }
 
  // wire up the nat to close when nmgr closes.

p2p/net/swarm/swarm.go

@@ -187,7 +187,7 @@ func (s *Swarm) NewStreamWithPeer(p peer.ID) (*Stream, error) {
  // if we have no connections, try connecting.
  if len(s.ConnectionsToPeer(p)) == 0 {
  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
  }
  }