Merge branch 'retry-listener' of https://github.com/codercom/go-util into retry-listener

nhooyr · nhooyr · commit 5d048f381606 · 2017-09-16T20:29:15.000-04:00
diff --git a/retry.go b/retry.go
@@ -98,7 +98,7 @@ func BackoffContext(ctx context.Context, ceil time.Duration, floor time.Duration
 }
 
 type Listener struct {
-	LogTmpErr func(err error, retryDelay time.Duration)
+	LogTmpErr func(err error)
 	net.Listener
 }
 
@@ -125,7 +125,7 @@ func (l *Listener) Accept() (net.Conn, error) {
 				if l.LogTmpErr == nil {
 					log.Printf("retry: temp error accepting next connection: %v; retrying in %v", err, retryDelay)
 				} else {
-					l.LogTmpErr(err, retryDelay)
+					l.LogTmpErr(err)
 				}
 				time.Sleep(retryDelay)
 				continue
diff --git a/retry_test.go b/retry_test.go
@@ -129,7 +129,7 @@ type testListener struct {
 
 func newTestListener(acceptFn func() (net.Conn, error)) net.Listener {
 	return &Listener{
-		LogTmpErr: func(err error, retry time.Duration) {},
+		LogTmpErr: func(err error) {},
 		Listener: &testListener{
 			acceptFn: acceptFn,
 		},

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func BackoffContext(ctx context.Context, ceil time.Duration, floor time.Duration`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`type Listener struct {`
`101`		`- LogTmpErr func(err error, retryDelay time.Duration)`
	`101`	`+ LogTmpErr func(err error)`
`102`	`102`	`net.Listener`
`103`	`103`	`}`
`104`	`104`
`@@ -125,7 +125,7 @@ func (l *Listener) Accept() (net.Conn, error) {`
`125`	`125`	`if l.LogTmpErr == nil {`
`126`	`126`	`log.Printf("retry: temp error accepting next connection: %v; retrying in %v", err, retryDelay)`
`127`	`127`	`} else {`
`128`		`- l.LogTmpErr(err, retryDelay)`
	`128`	`+ l.LogTmpErr(err)`
`129`	`129`	`}`
`130`	`130`	`time.Sleep(retryDelay)`
`131`	`131`	`continue`