diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:57:26 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-09 16:57:26 +0000 |
| commit | 6a88498bf9175276aaf09976dfd19f312454fc05 (patch) | |
| tree | bd1822bd970033a35e39e3ed8e1d12ae6bcd815a /config.yml.example | |
| parent | bb43a85dc855198746a901e8900cef184a0edcab (diff) | |
| parent | b963018eec171be99a2658b6ea38ba9f6cb5cb55 (diff) | |
| download | gitlab-shell-6a88498bf9175276aaf09976dfd19f312454fc05.tar.gz | |
Merge branch 'net-read-timeout' into 'master'
Increase HTTP timeout and log request durations
On some GitLab deployments internal API calls regularly take more than
60 seconds (the default HTTP read timeout of Ruby's Net::HTTP). Until
we understand the cause of this slowness, by raising the client
timeout in gitlab-shell we can at least spare end users having to
retry their `git pull` or `git push`.
See merge request !37
Diffstat (limited to 'config.yml.example')
| -rw-r--r-- | config.yml.example | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config.yml.example b/config.yml.example index a842ea2..eff354d 100644 --- a/config.yml.example +++ b/config.yml.example @@ -17,6 +17,7 @@ gitlab_url: "http://localhost:8080" # See installation.md#using-https for additional HTTPS configuration details. http_settings: +# read_timeout: 300 # user: someone # password: somepass # ca_file: /etc/ssl/cert.pem |