baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updates Backoff

Browse source
This commit is contained in:
Ludovic Fernandez 2019-02-04 16:38:08 +01:00 committed by Traefiker Bot
parent 0561a20c06
commit f19c497621
32 changed files with 47 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Gopkg.lock generated
View file

@ -299,12 +299,12 @@
revision = "4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9"
[[projects]]
branch = "master"
digest = "1:97b8422f271b83e760ce1279715d0f5d124f267459b56806306a64a0f82721c9"
name = "github.com/cenk/backoff"
digest = "1:cdee563173093e5ae7ab2a19c298e0904129719e1919a3c532b7bb0c3398b818"
name = "github.com/cenkalti/backoff"
packages = ["."]
pruneopts = "NUT"
revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
revision = "1e4cf3da559842a91afcb6ea6141451e6c30c618"
version = "v2.1.1"
[[projects]]
digest = "1:03cfacdc6bfd46007c15786c1ece3fa074f89e5193a292f0f26d9e98c99c7cc2"
@ -2278,7 +2278,7 @@
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface",
"github.com/aws/aws-sdk-go/service/ec2",
"github.com/aws/aws-sdk-go/service/ecs",
"github.com/cenk/backoff",
"github.com/cenkalti/backoff",
"github.com/containous/alice",
"github.com/containous/flaeg",
"github.com/containous/flaeg/parse",
@ -2364,6 +2364,7 @@
"github.com/vulcand/oxy/ratelimit",
"github.com/vulcand/oxy/roundrobin",
"github.com/vulcand/oxy/utils",
"github.com/vulcand/predicate",
"github.com/xenolf/lego/certcrypto",
"github.com/xenolf/lego/certificate",
"github.com/xenolf/lego/challenge",

4
Gopkg.toml
View file

@ -54,8 +54,8 @@
version = "1.13.11"
[[constraint]]
branch = "master"
name = "github.com/cenk/backoff"
name = "github.com/cenkalti/backoff"
version = "2.1.1"
[[constraint]]
name = "github.com/containous/flaeg"

2
acme/acme.go
View file

@ -16,7 +16,7 @@ import (
"time"
"github.com/BurntSushi/ty/fun"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/mux"
"github.com/containous/staert"
"github.com/containous/traefik/cluster"

2
acme/challenge_http_provider.go
View file

@ -5,7 +5,7 @@ import (
"sync"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/cluster"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"

2
acme/challenge_tls_provider.go
View file

@ -7,7 +7,7 @@ import (
"sync"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/cluster"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"

2
cluster/datastore.go
View file

@ -8,7 +8,7 @@ import (
"time"
"github.com/abronan/valkeyrie/store"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/staert"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"

2
cluster/leadership.go
View file

@ -5,7 +5,7 @@ import (
"net/http"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/mux"
"github.com/containous/traefik/log"
"github.com/containous/traefik/old/types"

2
cmd/traefik/traefik.go
View file

@ -12,7 +12,7 @@ import (
"strings"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/flaeg"
"github.com/containous/staert"
"github.com/containous/traefik/autogen/genstatic"

2
job/job.go
View file

@ -3,7 +3,7 @@ package job
import (
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
)
var (

2
job/job_test.go
View file

@ -4,7 +4,7 @@ import (
"testing"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
)
func TestJobBackOff(t *testing.T) {

2
old/provider/consulcatalog/consul_catalog.go
View file

@ -9,7 +9,7 @@ import (
"time"
"github.com/BurntSushi/ty/fun"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/provider"

2
old/provider/dynamodb/dynamodb.go
View file

@ -12,7 +12,7 @@ import (
"github.com/aws/aws-sdk-go/service/dynamodb"
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute"
"github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/provider"

2
old/provider/ecs/ecs.go
View file

@ -13,7 +13,7 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/aws/aws-sdk-go/service/ecs"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/provider"

2
old/provider/eureka/eureka.go
View file

@ -5,7 +5,7 @@ import (
"time"
"github.com/ArthurHlt/go-eureka-client/eureka"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/flaeg/parse"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"

2
old/provider/kubernetes/kubernetes.go
View file

@ -15,7 +15,7 @@ import (
"text/template"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/provider"

2
old/provider/kv/kv.go
View file

@ -8,7 +8,7 @@ import (
"github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/provider"

2
old/provider/mesos/mesos.go
View file

@ -5,7 +5,7 @@ import (
"strings"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/provider"

2
old/provider/rancher/api.go
View file

@ -5,7 +5,7 @@ import (
"os"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/types"

2
old/provider/rancher/metadata.go
View file

@ -5,7 +5,7 @@ import (
"fmt"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/old/log"
"github.com/containous/traefik/old/types"

2
provider/acme/challenge_http.go
View file

@ -6,7 +6,7 @@ import (
"net/http"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/mux"
"github.com/containous/traefik/log"
"github.com/containous/traefik/safe"

2
provider/acme/provider.go
View file

@ -13,7 +13,7 @@ import (
"sync"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/flaeg/parse"
"github.com/containous/traefik/config"
"github.com/containous/traefik/log"

2
provider/docker/docker.go
View file

@ -11,7 +11,7 @@ import (
"text/template"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/config"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"

2
provider/marathon/marathon.go
View file

@ -9,7 +9,7 @@ import (
"text/template"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/flaeg/parse"
"github.com/containous/traefik/config"
"github.com/containous/traefik/job"

2
safe/routine.go
View file

@ -6,7 +6,7 @@ import (
"runtime/debug"
"sync"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
"github.com/containous/traefik/log"
)

2
safe/routine_test.go
View file

@ -7,7 +7,7 @@ import (
"testing"
"time"
"github.com/cenk/backoff"
"github.com/cenkalti/backoff"
)
func TestNewPoolContext(t *testing.T) {

0
vendor/github.com/cenk/backoff/LICENSE → vendor/github.com/cenkalti/backoff/LICENSE generated vendored
View file

0
vendor/github.com/cenk/backoff/backoff.go → vendor/github.com/cenkalti/backoff/backoff.go generated vendored
View file

11
vendor/github.com/cenk/backoff/context.go → vendor/github.com/cenkalti/backoff/context.go generated vendored
View file

@ -1,9 +1,8 @@
package backoff
import (
"context"
"time"
"golang.org/x/net/context"
)
// BackOffContext is a backoff policy that stops retrying after the context
@ -52,9 +51,13 @@ func (b *backOffContext) Context() context.Context {
func (b *backOffContext) NextBackOff() time.Duration {
select {
case <-b.Context().Done():
case <-b.ctx.Done():
return Stop
default:
return b.BackOff.NextBackOff()
}
next := b.BackOff.NextBackOff()
if deadline, ok := b.ctx.Deadline(); ok && deadline.Sub(time.Now()) < next {
return Stop
}
return next
}

7
vendor/github.com/cenk/backoff/exponential.go → vendor/github.com/cenkalti/backoff/exponential.go generated vendored
View file

@ -63,7 +63,6 @@ type ExponentialBackOff struct {
currentInterval time.Duration
startTime time.Time
random *rand.Rand
}
// Clock is an interface that returns current time for BackOff.
@ -89,7 +88,6 @@ func NewExponentialBackOff() *ExponentialBackOff {
MaxInterval: DefaultMaxInterval,
MaxElapsedTime: DefaultMaxElapsedTime,
Clock: SystemClock,
random: rand.New(rand.NewSource(time.Now().UnixNano())),
}
b.Reset()
return b
@ -118,10 +116,7 @@ func (b *ExponentialBackOff) NextBackOff() time.Duration {
return Stop
}
defer b.incrementCurrentInterval()
if b.random == nil {
b.random = rand.New(rand.NewSource(time.Now().UnixNano()))
}
return getRandomValueFromInterval(b.RandomizationFactor, b.random.Float64(), b.currentInterval)
return getRandomValueFromInterval(b.RandomizationFactor, rand.Float64(), b.currentInterval)
}
// GetElapsedTime returns the elapsed time since an ExponentialBackOff instance

12
vendor/github.com/cenk/backoff/retry.go → vendor/github.com/cenkalti/backoff/retry.go generated vendored
View file

@ -15,7 +15,6 @@ type Notify func(error, time.Duration)
// Retry the operation o until it does not return error or BackOff stops.
// o is guaranteed to be run at least once.
// It is the caller's responsibility to reset b after Retry returns.
//
// If o returns a *PermanentError, the operation is not retried, and the
// wrapped error is returned.
@ -29,6 +28,7 @@ func Retry(o Operation, b BackOff) error { return RetryNotify(o, b, nil) }
func RetryNotify(operation Operation, b BackOff, notify Notify) error {
var err error
var next time.Duration
var t *time.Timer
cb := ensureContext(b)
@ -42,7 +42,7 @@ func RetryNotify(operation Operation, b BackOff, notify Notify) error {
return permanent.Err
}
if next = b.NextBackOff(); next == Stop {
if next = cb.NextBackOff(); next == Stop {
return err
}
@ -50,11 +50,15 @@ func RetryNotify(operation Operation, b BackOff, notify Notify) error {
notify(err, next)
}
t := time.NewTimer(next)
if t == nil {
t = time.NewTimer(next)
defer t.Stop()
} else {
t.Reset(next)
}
select {
case <-cb.Context().Done():
t.Stop()
return err
case <-t.C:
}

2
vendor/github.com/cenk/backoff/ticker.go → vendor/github.com/cenkalti/backoff/ticker.go generated vendored
View file

@ -1,7 +1,6 @@
package backoff
import (
"runtime"
"sync"
"time"
)
@ -34,7 +33,6 @@ func NewTicker(b BackOff) *Ticker {
}
t.b.Reset()
go t.run()
runtime.SetFinalizer(t, (*Ticker).Stop)
return t
}

0
vendor/github.com/cenk/backoff/tries.go → vendor/github.com/cenkalti/backoff/tries.go generated vendored
View file