From eea806d673f060c2660c84ef8fe7f964824460de Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 28 Jun 2022 12:09:11 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- workhorse/internal/upstream/upstream.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'workhorse/internal') diff --git a/workhorse/internal/upstream/upstream.go b/workhorse/internal/upstream/upstream.go index 6d107fc28cd..fb511b5d456 100644 --- a/workhorse/internal/upstream/upstream.go +++ b/workhorse/internal/upstream/upstream.go @@ -217,19 +217,18 @@ func (u *upstream) pollGeoProxyAPI() { func (u *upstream) callGeoProxyAPI() { geoProxyData, err := u.APIClient.GetGeoProxyData() if err != nil { - log.WithError(err).WithFields(log.Fields{"geoProxyBackend": u.geoProxyBackend}).Error("Geo Proxy: Unable to determine Geo Proxy URL. Fallback on cached value.") + // Unable to determine Geo Proxy URL. Fallback on cached value. return } hasProxyDataChanged := false if u.geoProxyBackend.String() != geoProxyData.GeoProxyURL.String() { - log.WithFields(log.Fields{"oldGeoProxyURL": u.geoProxyBackend, "newGeoProxyURL": geoProxyData.GeoProxyURL}).Info("Geo Proxy: URL changed") + // URL changed hasProxyDataChanged = true } if u.geoProxyExtraData != geoProxyData.GeoProxyExtraData { - // extra data is usually a JWT, thus not explicitly logging it - log.Info("Geo Proxy: signed data changed") + // Signed data changed hasProxyDataChanged = true } -- cgit v1.2.3