Merge pull request #6 from libp2p/feat/better-dial-logs

whyrusleeping · web-flow · commit b6a045f52522 · 2016-11-22T12:24:49.000-08:00
log addr with failures
diff --git a/p2p/net/swarm/limiter.go b/p2p/net/swarm/limiter.go
@@ -12,6 +12,7 @@ import (
 
 type dialResult struct {
 	Conn iconn.Conn
+	Addr ma.Multiaddr
 	Err  error
 }
 
@@ -141,7 +142,7 @@ func (dl *dialLimiter) executeDial(j *dialJob) {
 
 	con, err := dl.dialFunc(j.ctx, j.peer, j.addr)
 	select {
-	case j.resp <- dialResult{Conn: con, Err: err}:
+	case j.resp <- dialResult{Conn: con, Addr: j.addr, Err: err}:
 	case <-j.ctx.Done():
 	}
 }
diff --git a/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go
@@ -318,7 +318,7 @@ func (s *Swarm) dialAddrs(ctx context.Context, p peer.ID, remoteAddrs <-chan ma.
 		case resp := <-respch:
 			active--
 			if resp.Err != nil {
-				log.Info("got error on dial: ", resp.Err)
+				log.Info("got error on dial to %s: ", resp.Addr, resp.Err)
 				// Errors are normal, lots of dials will fail
 				exitErr = resp.Err
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ import (`
`12`	`12`
`13`	`13`	`type dialResult struct {`
`14`	`14`	`Conn iconn.Conn`
	`15`	`+ Addr ma.Multiaddr`
`15`	`16`	`Err error`
`16`	`17`	`}`
`17`	`18`
`@@ -141,7 +142,7 @@ func (dl dialLimiter) executeDial(j dialJob) {`
`141`	`142`
`142`	`143`	`con, err := dl.dialFunc(j.ctx, j.peer, j.addr)`
`143`	`144`	`select {`
`144`		`- case j.resp <- dialResult{Conn: con, Err: err}:`
	`145`	`+ case j.resp <- dialResult{Conn: con, Addr: j.addr, Err: err}:`
`145`	`146`	`case <-j.ctx.Done():`
`146`	`147`	`}`
`147`	`148`	`}`