diff --git a/.github/workflows/docker-main.yaml b/.github/workflows/docker-main.yaml index 1e2adafc5..3e5e4a425 100644 --- a/.github/workflows/docker-main.yaml +++ b/.github/workflows/docker-main.yaml @@ -47,7 +47,7 @@ jobs: echo ::set-output name=sha-tag::${SHA_TAG} - name: Docker Publish - Main - uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # pin@v2 + uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # pin@v2 with: context: . file: ./Dockerfile @@ -60,7 +60,7 @@ jobs: org.opencontainers.image.revision=${{ github.sha }} - name: Docker Publish - Debug - uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # pin@v2 + uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # pin@v2 with: context: . file: ./Dockerfile.debug diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4225af72d..43d011f28 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -210,7 +210,7 @@ jobs: uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 - name: Docker Build - uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 + uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 with: context: . file: ./Dockerfile diff --git a/pkg/grpc/databroker/leaser.go b/pkg/grpc/databroker/leaser.go index f2b9cf991..174decae1 100644 --- a/pkg/grpc/databroker/leaser.go +++ b/pkg/grpc/databroker/leaser.go @@ -96,7 +96,7 @@ func (locker *Leaser) runOnce(ctx context.Context, resetBackoff func()) error { if status.Code(err) == codes.AlreadyExists { return nil } else if err != nil { - log.Warn(ctx).Err(err).Msg("leaser: error acquiring lease") + log.Warn(ctx).Err(err).Str("lease_name", locker.leaseName).Msg("leaser: error acquiring lease") return retryableError{err} } resetBackoff() @@ -148,7 +148,7 @@ func (locker *Leaser) withLease(ctx context.Context, leaseID string) error { // failed to renew lease return nil } else if err != nil { - log.Warn(ctx).Err(err).Msg("leaser: error renewing lease") + log.Warn(ctx).Err(err).Str("lease_name", locker.leaseName).Msg("leaser: error renewing lease") return retryableError{err} } }