making the daemon shutdown quicker

whyrusleeping · whyrusleeping · commit 191ac62c12fa · 2015-07-14T14:04:56.000-07:00
License: MIT
Signed-off-by: Jeromy &lt;jeromyj@gmail.com&gt;
diff --git a/exchange/bitswap/wantmanager.go b/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
 		}
 	}
 }
diff --git a/p2p/host/basic/natmgr.go b/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.
diff --git a/p2p/net/swarm/swarm.go b/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
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,8 @@ func (mq *msgQueue) runQueue(ctx context.Context) {`
`140`	`140`	`mq.doWork(ctx)`
`141`	`141`	`case <-mq.done:`
`142`	`142`	`return`
	`143`	`+ case <-ctx.Done():`
	`144`	`+ return`
`143`	`145`	`}`
`144`	`146`	`}`
`145`	`147`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ func (s Swarm) NewStreamWithPeer(p peer.ID) (Stream, error) {`
`187`	`187`	`// if we have no connections, try connecting.`
`188`	`188`	`if len(s.ConnectionsToPeer(p)) == 0 {`
`189`	`189`	`log.Debug("Swarm: NewStreamWithPeer no connections. Attempting to connect...")`
`190`		`- if _, err := s.Dial(context.Background(), p); err != nil {`
	`190`	`+ if _, err := s.Dial(s.Context(), p); err != nil {`
`191`	`191`	`return nil, err`
`192`	`192`	`}`
`193`	`193`	`}`