Skip to content

Commit 3a59b4f

Browse files
committed
BUGFIX: update retry constant from cenkalti/backoff/v4
1 parent e8beeb2 commit 3a59b4f

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module github.com/taylorchu/work
33
go 1.15
44

55
require (
6-
github.com/cenkalti/backoff/v3 v3.2.2
6+
github.com/cenkalti/backoff/v4 v4.1.0
77
github.com/go-redis/redis/v7 v7.4.0
8-
github.com/google/uuid v1.1.1
8+
github.com/google/uuid v1.1.2
99
github.com/prometheus/client_golang v1.7.1
1010
github.com/sirupsen/logrus v1.7.0
1111
github.com/stretchr/testify v1.6.1

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF
55
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
66
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
77
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
8-
github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
9-
github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
8+
github.com/cenkalti/backoff/v4 v4.1.0 h1:c8LkOFQTzuO0WBM/ae5HdGQuZPfPxp7lqBRwQRm4fSc=
9+
github.com/cenkalti/backoff/v4 v4.1.0/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
1010
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1111
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
1212
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -34,8 +34,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
3434
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
3535
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
3636
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
37-
github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
38-
github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
37+
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
38+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
3939
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
4040
github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
4141
github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=

worker.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"sync"
99
"time"
1010

11-
"github.com/cenkalti/backoff/v3"
11+
"github.com/cenkalti/backoff/v4"
1212
)
1313

1414
// DequeueFunc generates a job.
@@ -387,10 +387,13 @@ func retry(queue Queue) HandleMiddleware {
387387
job.LastError = err.Error()
388388
job.UpdatedAt = now
389389

390+
// https://github.com/grpc/grpc/blob/master/doc/connection-backoff.md
390391
b := backoff.NewExponentialBackOff()
391-
b.InitialInterval = time.Duration(opt.InvisibleSec) * time.Second
392-
b.MaxInterval = 24 * time.Hour
393-
b.RandomizationFactor = 0.1
392+
b.InitialInterval = 2 * time.Second
393+
b.RandomizationFactor = 0.2
394+
b.Multiplier = 1.6
395+
b.MaxInterval = 120 * time.Second
396+
b.MaxElapsedTime = 0
394397
b.Reset()
395398

396399
var next time.Duration

worker_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,6 @@ func TestRetry(t *testing.T) {
393393
t.Log("delay", delays)
394394
for i := 1; i < len(delays); i++ {
395395
require.True(t, delays[i] > delays[i-1])
396-
require.True(t, delays[i] > opt.InvisibleSec)
396+
require.True(t, delays[i] > 1)
397397
}
398398
}

0 commit comments

Comments
 (0)