Merge branch 'sh-fix-long-polling-50s' into 'master'

Fix long polling to default to 50 s instead of 50 ns

See merge request gitlab-org/gitlab-workhorse!687

changelogs/unreleased/sh-fix-long-polling-50s.yml

+---
+title: Fix long polling to default to 50 s instead of 50 ns
+merge_request: 687
+author:
+type: fixed

config_test.go

@@ -85,7 +85,7 @@ func TestConfigDefaults(t *testing.T) {
 		DocumentRoot:             "public",
 		ProxyHeadersTimeout:      5 * time.Minute,
 		APIQueueTimeout:          queueing.DefaultTimeout,
-		APICILongPollingDuration: 50 * time.Nanosecond, // TODO this is meant to be 50*time.Second but it has been wrong for ages
+		APICILongPollingDuration: 50 * time.Second,
 		ImageResizerConfig:       config.DefaultImageResizerConfig,
 	}
 

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 {