summaryrefslogtreecommitdiff
path: root/workhorse/main.go
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-03-08 12:09:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-03-08 12:09:01 +0000
commiteb2d243280ff0fd72d097a1426c05ce1a3501914 (patch)
tree82b290cd9896b60fca8dcc80f49433a0fad07ef8 /workhorse/main.go
parentee5990fa228fbbb7223b88837f83dd76feb75b9c (diff)
downloadgitlab-ce-eb2d243280ff0fd72d097a1426c05ce1a3501914.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'workhorse/main.go')
-rw-r--r--workhorse/main.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/workhorse/main.go b/workhorse/main.go
index 47ab63a875a..28162a00fae 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, "Long polling duration for job requesting for runners (default 50s - enabled)")
+ fset.DurationVar(&cfg.APICILongPollingDuration, "apiCiLongPollingDuration", 50*time.Second, "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 {