diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-06 18:14:39 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-06 18:14:39 +0300 |
| commit | 55242833f832095a6fcff00b1ccacbc5900ee52a (patch) | |
| tree | 6e17b16638e60099533473b540fe8f635d2f25da /workhorse/internal/upstream | |
| parent | 7c31b0312ba0eae4e4ebe54125b13aa2ae5f5db4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/internal/upstream')
| -rw-r--r-- | workhorse/internal/upstream/upstream.go | 2 | ||||
| -rw-r--r-- | workhorse/internal/upstream/upstream_test.go | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/workhorse/internal/upstream/upstream.go b/workhorse/internal/upstream/upstream.go index 6835569dfa8..99d1245fafc 100644 --- a/workhorse/internal/upstream/upstream.go +++ b/workhorse/internal/upstream/upstream.go @@ -207,8 +207,8 @@ func (u *upstream) findGeoProxyRoute(cleanedPath string, r *http.Request) *route func (u *upstream) pollGeoProxyAPI() { for { - u.geoProxyPollSleep(geoProxyApiPollingInterval) u.callGeoProxyAPI() + u.geoProxyPollSleep(geoProxyApiPollingInterval) } } diff --git a/workhorse/internal/upstream/upstream_test.go b/workhorse/internal/upstream/upstream_test.go index c685f82c388..2031fa84ce2 100644 --- a/workhorse/internal/upstream/upstream_test.go +++ b/workhorse/internal/upstream/upstream_test.go @@ -314,9 +314,5 @@ func startWorkhorseServer(railsServerURL string, enableGeoProxyFeature bool) (*h } } - // Since the first sleep happens before any API call, this ensures - // we call the API at least once. - waitForNextApiPoll() - return ws, ws.Close, waitForNextApiPoll } |