diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 09:09:57 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-07-15 09:09:57 +0300 |
| commit | 4b41b57abf3ad9c2e0e81b3804cb01af6f879349 (patch) | |
| tree | fc8919c5c45d52d860b0f267fdab23c787243659 /workhorse/internal/upstream | |
| parent | 08e3d715127256b53529a7719b80569aa0d8bc52 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/upstream')
| -rw-r--r-- | workhorse/internal/upstream/upstream.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/workhorse/internal/upstream/upstream.go b/workhorse/internal/upstream/upstream.go index f836e32f06c..43b470b568f 100644 --- a/workhorse/internal/upstream/upstream.go +++ b/workhorse/internal/upstream/upstream.go @@ -23,7 +23,6 @@ import ( apipkg "gitlab.com/gitlab-org/gitlab/workhorse/internal/api" "gitlab.com/gitlab-org/gitlab/workhorse/internal/config" "gitlab.com/gitlab-org/gitlab/workhorse/internal/helper" - "gitlab.com/gitlab-org/gitlab/workhorse/internal/log" proxypkg "gitlab.com/gitlab-org/gitlab/workhorse/internal/proxy" "gitlab.com/gitlab-org/gitlab/workhorse/internal/rejectmethods" "gitlab.com/gitlab-org/gitlab/workhorse/internal/upload" @@ -183,20 +182,16 @@ func (u *upstream) findGeoProxyRoute(cleanedPath string, r *http.Request) *route defer u.mu.RUnlock() if u.geoProxyBackend.String() == "" { - log.WithRequest(r).Debug("Geo Proxy: Not a Geo proxy") return nil } // Some routes are safe to serve from this GitLab instance for _, ro := range u.geoLocalRoutes { if ro.isMatch(cleanedPath, r) { - log.WithRequest(r).Debug("Geo Proxy: Handle this request locally") return &ro } } - log.WithRequest(r).WithFields(log.Fields{"geoProxyBackend": u.geoProxyBackend}).Debug("Geo Proxy: Forward this request") - if cleanedPath == "/-/cable" { return &u.geoProxyCableRoute } |