Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Newdigate <andrew@gitlab.com>2018-07-11 13:52:48 +0300
committerAndrew Newdigate <andrew@gitlab.com>2018-07-11 14:11:42 +0300
commit7ee5b1f6fb4e4e77111a194631476456cf4f9f97 (patch)
tree9b05f80c68ffc265a5205f6e62977efa54376485 /lib/gitaly
parent67708aa57874c7ae33581ca9f217fde82ce7be76 (diff)
Add a fast_timeout for the `ServerService.ServerInfo` endpoint
Diffstat (limited to 'lib/gitaly')
-rw-r--r--lib/gitaly/server.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitaly/server.rb b/lib/gitaly/server.rb
index 2760211fee8..f95e423ef22 100644
--- a/lib/gitaly/server.rb
+++ b/lib/gitaly/server.rb
@@ -50,7 +50,7 @@ module Gitaly
@info ||=
begin
Gitlab::GitalyClient::ServerService.new(@storage).info
- rescue GRPC::Unavailable, GRPC::GRPC::DeadlineExceeded
+ rescue GRPC::Unavailable, GRPC::DeadlineExceeded
# This will show the server as being out of date
Gitaly::ServerInfoResponse.new(git_version: '', server_version: '', storage_statuses: [])
end