diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-10-26 18:03:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-10-26 18:03:40 +0000 |
| commit | f2e9148d18c049bb699e60ed31d3804f9ae4b592 (patch) | |
| tree | ac2cb61e83d5c7077523c14f928ef6e11ec0384c /app/controllers/projects | |
| parent | 578064df4d58fb0409fec51fe03c4b95181a5f5f (diff) | |
| parent | c6c17f1ca636f879c245133cffeae531a7d3df55 (diff) | |
| download | gitlab-ce-f2e9148d18c049bb699e60ed31d3804f9ae4b592.tar.gz | |
Merge branch '42790-improve-feedback-for-internal-git-access-checks-timeouts' into 'master'
Adds trace of each access check when git push times out
Closes #42790
See merge request gitlab-org/gitlab-ce!22265
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/git_http_controller.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/controllers/projects/git_http_controller.rb b/app/controllers/projects/git_http_controller.rb index be708835e30..c0aa39d87c6 100644 --- a/app/controllers/projects/git_http_controller.rb +++ b/app/controllers/projects/git_http_controller.rb @@ -8,6 +8,7 @@ class Projects::GitHttpController < Projects::GitHttpClientController rescue_from Gitlab::GitAccess::UnauthorizedError, with: :render_403 rescue_from Gitlab::GitAccess::NotFoundError, with: :render_404 rescue_from Gitlab::GitAccess::ProjectCreationError, with: :render_422 + rescue_from Gitlab::GitAccess::TimeoutError, with: :render_503 # GET /foo/bar.git/info/refs?service=git-upload-pack (git pull) # GET /foo/bar.git/info/refs?service=git-receive-pack (git push) @@ -62,6 +63,10 @@ class Projects::GitHttpController < Projects::GitHttpClientController render plain: exception.message, status: :unprocessable_entity end + def render_503(exception) + render plain: exception.message, status: :service_unavailable + end + def access @access ||= access_klass.new(access_actor, project, 'http', authentication_abilities: authentication_abilities, |