Commit 70260d07 authored by Patrick Bajao's avatar Patrick Bajao

Merge branch 'jv-workhorse-8.65.0' into 'master'

Use workhorse 8.65.0

See merge request gitlab-org/gitlab!55843
parents a4771b1a 72e0329c
# Changelog for gitlab-workhorse # Changelog for gitlab-workhorse
## v8.64.2 ## v8.65.0
### Security ### Fixed
- Stop logging when path is excluded - Fix long polling to default to 50 s instead of 50 ns
https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/ https://gitlab.com/gitlab-org/gitlab-workhorse/-/merge_requests/687
## v8.64.1
### Security ### Security
- Use URL.EscapePath() in upstream router - Use URL.EscapePath() in upstream router
......
...@@ -85,7 +85,7 @@ func TestConfigDefaults(t *testing.T) { ...@@ -85,7 +85,7 @@ func TestConfigDefaults(t *testing.T) {
DocumentRoot: "public", DocumentRoot: "public",
ProxyHeadersTimeout: 5 * time.Minute, ProxyHeadersTimeout: 5 * time.Minute,
APIQueueTimeout: queueing.DefaultTimeout, 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, ImageResizerConfig: config.DefaultImageResizerConfig,
} }
......
...@@ -102,7 +102,7 @@ func buildConfig(arg0 string, args []string) (*bootConfig, *config.Config, error ...@@ -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.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.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.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") 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 { if err := fset.Parse(args); err != nil {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment