Improve context use

b3377755 · Matt Joiner · 94b3bc9b · b3377755 · b3377755
Commit b3377755 authored Feb 15, 2019 by Matt Joiner
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

limiter.go limiter.go +1 -6

swarm_listen.go swarm_listen.go +3 -1

No files found.
--- a/limiter.go
+++ b/limiter.go
@@ -27,12 +27,7 @@ type dialJob struct {
 }
 func (dj *dialJob) cancelled() bool {
-	select {
+	return dj.ctx.Err() != nil
-	case <-dj.ctx.Done():
-		return true
-	default:
-		return false
-	}
 }
 func (dj *dialJob) dialTimeout() time.Duration {

--- a/swarm_listen.go
+++ b/swarm_listen.go
@@ -74,7 +74,9 @@ func (s *Swarm) AddListenAddr(a ma.Multiaddr) error {
 		for {
 			c, err := list.Accept()
 			if err != nil {
-				log.Warningf("swarm listener accept error: %s", err)
+				if s.ctx.Err() == nil {
+					log.Errorf("swarm listener accept error: %s", err)
+				}
 				return
 			}
 			log.Debugf("swarm listener accepted connection: %s", c)