3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-07-04 18:38:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge main

Browse source
This commit is contained in:
Caleb Doxsey 2022-07-26 08:24:12 -06:00
commit cd7c85d478
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/docker-main.yaml vendored
View file

@ -47,7 +47,7 @@ jobs:
echo ::set-output name=sha-tag::${SHA_TAG} echo ::set-output name=sha-tag::${SHA_TAG}
- name: Docker Publish - Main - name: Docker Publish - Main
uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # pin@v2 uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # pin@v2
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile
@ -60,7 +60,7 @@ jobs:
org.opencontainers.image.revision=${{ github.sha }} org.opencontainers.image.revision=${{ github.sha }}
- name: Docker Publish - Debug - name: Docker Publish - Debug
uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 # pin@v2 uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0 # pin@v2
with: with:
context: . context: .
file: ./Dockerfile.debug file: ./Dockerfile.debug

2
.github/workflows/test.yaml vendored
View file

@ -210,7 +210,7 @@ jobs:
uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6 uses: docker/setup-buildx-action@dc7b9719a96d48369863986a06765841d7ea23f6
- name: Docker Build - name: Docker Build
uses: docker/build-push-action@e551b19e49efd4e98792db7592c17c09b89db8d8 uses: docker/build-push-action@1cb9d22b932e4832bb29793b7777ec860fc1cde0
with: with:
context: . context: .
file: ./Dockerfile file: ./Dockerfile

4
pkg/grpc/databroker/leaser.go
View file

@ -96,7 +96,7 @@ func (locker *Leaser) runOnce(ctx context.Context, resetBackoff func()) error {
if status.Code(err) == codes.AlreadyExists { if status.Code(err) == codes.AlreadyExists {
return nil return nil
} else if err != 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} return retryableError{err}
} }
resetBackoff() resetBackoff()
@ -148,7 +148,7 @@ func (locker *Leaser) withLease(ctx context.Context, leaseID string) error {
// failed to renew lease // failed to renew lease
return nil return nil
} else if err != 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} return retryableError{err}
} }
} }