Rename -apiCiLongPolling to -apiCiLongPollingDuration

README.md

@@ -36,7 +36,7 @@ gitlab-workhorse'][brief-history-blog].
   gitlab-workhorse [OPTIONS]
 
 Options:
-  -apiCiLongPolling duration
+  -apiCiLongPollingDuration duration
         Long polling duration for job requesting for runners (default 0s - disabled)
   -apiLimit uint
         Number of API requests allowed at single time

internal/config/config.go

@@ -28,17 +28,17 @@ type RedisConfig struct {
 }
 
 type Config struct {
-	Redis               *RedisConfig  `toml:"redis"`
-	Backend             *url.URL      `toml:"-"`
-	Version             string        `toml:"-"`
-	DocumentRoot        string        `toml:"-"`
-	DevelopmentMode     bool          `toml:"-"`
-	Socket              string        `toml:"-"`
-	ProxyHeadersTimeout time.Duration `toml:"-"`
-	APILimit            uint          `toml:"-"`
-	APIQueueLimit       uint          `toml:"-"`
-	APIQueueTimeout     time.Duration `toml:"-"`
-	APICILongPolling    time.Duration `toml:"-"`
+	Redis                    *RedisConfig  `toml:"redis"`
+	Backend                  *url.URL      `toml:"-"`
+	Version                  string        `toml:"-"`
+	DocumentRoot             string        `toml:"-"`
+	DevelopmentMode          bool          `toml:"-"`
+	Socket                   string        `toml:"-"`
+	ProxyHeadersTimeout      time.Duration `toml:"-"`
+	APILimit                 uint          `toml:"-"`
+	APIQueueLimit            uint          `toml:"-"`
+	APIQueueTimeout          time.Duration `toml:"-"`
+	APICILongPollingDuration time.Duration `toml:"-"`
 }
 
 // LoadConfig from a file

internal/upstream/routes.go

@@ -120,7 +120,7 @@ func (u *Upstream) configureRoutes() {
 
 	uploadAccelerateProxy := upload.Accelerate(path.Join(u.DocumentRoot, "uploads/tmp"), proxy)
 	ciAPIProxyQueue := queueing.QueueRequests(uploadAccelerateProxy, u.APILimit, u.APIQueueLimit, u.APIQueueTimeout)
-	ciAPILongPolling := builds.RegisterHandler(ciAPIProxyQueue, redis.WatchKey, u.APICILongPolling)
+	ciAPILongPolling := builds.RegisterHandler(ciAPIProxyQueue, redis.WatchKey, u.APICILongPollingDuration)
 
 	u.Routes = []routeEntry{
 		// Git Clone

main.go

@@ -51,7 +51,7 @@ var secretPath = flag.String("secretPath", "./.gitlab_workhorse_secret", "File w
 var apiLimit = flag.Uint("apiLimit", 0, "Number of API requests allowed at single time")
 var apiQueueLimit = flag.Uint("apiQueueLimit", 0, "Number of API requests allowed to be queued")
 var apiQueueTimeout = flag.Duration("apiQueueDuration", queueing.DefaultTimeout, "Maximum queueing duration of requests")
-var apiCiLongPolling = flag.Duration("apiCiLongPolling", 0, "Long polling duration for job requesting for runners (default 0s - disabled)")
+var apiCiLongPollingDuration = flag.Duration("apiCiLongPollingDuration", 0, "Long polling duration for job requesting for runners (default 0s - disabled)")
 var logFile = flag.String("logFile", "", "Log file to be used")
 var prometheusListenAddr = flag.String("prometheusListenAddr", "", "Prometheus listening address, e.g. ':9100'")
 
@@ -113,16 +113,16 @@ func main() {
 
 	secret.SetPath(*secretPath)
 	cfg := config.Config{
-		Backend:             backendURL,
-		Socket:              *authSocket,
-		Version:             Version,
-		DocumentRoot:        *documentRoot,
-		DevelopmentMode:     *developmentMode,
-		ProxyHeadersTimeout: *proxyHeadersTimeout,
-		APILimit:            *apiLimit,
-		APIQueueLimit:       *apiQueueLimit,
-		APIQueueTimeout:     *apiQueueTimeout,
-		APICILongPolling:    *apiCiLongPolling,
+		Backend:                  backendURL,
+		Socket:                   *authSocket,
+		Version:                  Version,
+		DocumentRoot:             *documentRoot,
+		DevelopmentMode:          *developmentMode,
+		ProxyHeadersTimeout:      *proxyHeadersTimeout,
+		APILimit:                 *apiLimit,
+		APIQueueLimit:            *apiQueueLimit,
+		APIQueueTimeout:          *apiQueueTimeout,
+		APICILongPollingDuration: *apiCiLongPollingDuration,
 	}
 
 	if *configFile != "" {