diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 18:14:27 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 18:14:27 +0300 |
| commit | afbaf78b0d819326741a01b093bdbc4702570417 (patch) | |
| tree | a16a6f2a8fcc18e60f25ac72df6ab22cfe0eae79 /workhorse | |
| parent | 38b3003b67db3f2eadfa81fd28b13d168f665766 (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'workhorse')
| -rw-r--r-- | workhorse/config_test.go | 2 | ||||
| -rw-r--r-- | workhorse/main.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/workhorse/config_test.go b/workhorse/config_test.go index cf33e5bb7ca..f9d12bd5e2b 100644 --- a/workhorse/config_test.go +++ b/workhorse/config_test.go @@ -85,7 +85,7 @@ func TestConfigDefaults(t *testing.T) { DocumentRoot: "public", ProxyHeadersTimeout: 5 * time.Minute, APIQueueTimeout: queueing.DefaultTimeout, - APICILongPollingDuration: 50 * time.Second, + APICILongPollingDuration: 50 * time.Nanosecond, // TODO this is meant to be 50*time.Second but it has been wrong for ages ImageResizerConfig: config.DefaultImageResizerConfig, } diff --git a/workhorse/main.go b/workhorse/main.go index 28162a00fae..47ab63a875a 100644 --- a/workhorse/main.go +++ b/workhorse/main.go @@ -102,7 +102,7 @@ func buildConfig(arg0 string, args []string) (*bootConfig, *config.Config, error fset.UintVar(&cfg.APILimit, "apiLimit", 0, "Number of API requests allowed at single time") fset.UintVar(&cfg.APIQueueLimit, "apiQueueLimit", 0, "Number of API requests allowed to be queued") fset.DurationVar(&cfg.APIQueueTimeout, "apiQueueDuration", queueing.DefaultTimeout, "Maximum queueing duration of requests") - fset.DurationVar(&cfg.APICILongPollingDuration, "apiCiLongPollingDuration", 50*time.Second, "Long polling duration for job requesting for runners (default 50s - enabled)") + fset.DurationVar(&cfg.APICILongPollingDuration, "apiCiLongPollingDuration", 50, "Long polling duration for job requesting for runners (default 50s - enabled)") fset.BoolVar(&cfg.PropagateCorrelationID, "propagateCorrelationID", false, "Reuse existing Correlation-ID from the incoming request header `X-Request-ID` if present") if err := fset.Parse(args); err != nil { |