From 7f5088931b75b7df800411959961e86ccb6cc111 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 2 Mar 2017 17:56:03 +0100
Subject: [PATCH] Rename -apiCiLongPolling to -apiCiLongPollingDuration
---
README.md | 2 +-
internal/config/config.go | 22 +++++++++++-----------
internal/upstream/routes.go | 2 +-
main.go | 22 +++++++++++-----------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index ddb1d372c510e..8c80c71192819 100644
--- a/README.md
+++ b/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
diff --git a/internal/config/config.go b/internal/config/config.go
index 7ba5796b4a1b5..dfb5b4fdeb2c0 100644
--- a/internal/config/config.go
+++ b/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
diff --git a/internal/upstream/routes.go b/internal/upstream/routes.go
index e2b8e122ee49d..b279595bc9e40 100644
--- a/internal/upstream/routes.go
+++ b/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
diff --git a/main.go b/main.go
index 4a3d0da1e3c8a..866b21dca7690 100644
--- a/main.go
+++ b/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 != "" {
--
GitLab