Skip to content
Snippets Groups Projects
Commit 49a041e4 authored by Alejandro Rodríguez's avatar Alejandro Rodríguez
Browse files

Be more permissive with Gitaly's connections (for the moment)

Gitaly is still in an early stage. Many installations won't have it
enabled at this stage. We still want the wiring, but for now we'll
prefer to fail fast, until Gitaly is more developed and made a mandatory
part of GitLab installations.
parent 730ebf83
No related branches found
No related tags found
1 merge request!118Add POST notification to gitaly on post-receive
Pipeline #
Loading
Loading
@@ -11,7 +11,8 @@ class GitalyClient < HttpClient
url = "#{gitaly_url}/post-receive"
params = { project: sanitize_path(repo_path) }
 
resp = post(url, params)
# NOTE: Consider being more permisive with gitaly once it's more robust
resp = post(url, params, read_timeout: 5)
 
resp.code == '200'
end
Loading
Loading
Loading
Loading
@@ -37,7 +37,8 @@ class GitlabPostReceive
end
print_merge_request_links(merge_request_urls)
 
result &&= notify_gitaly
# NOTE: Consider checking Gitaly's success once it's robust and mandatory
notify_gitaly
rescue HttpClient::ApiUnreachableError
nil
end
Loading
Loading
Loading
Loading
@@ -91,8 +91,8 @@ class HttpClient
request(:get, url, {}, options)
end
 
def post(url, params)
request(:post, url, params)
def post(url, params, options = {})
request(:post, url, params, options)
end
 
def cert_store
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment