diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-03-24 18:22:42 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-03-29 14:48:05 +0200 |
| commit | 1904c80f3dd5437cb39aa90de933279bf9635678 (patch) | |
| tree | 6de907068aadafc992ada78ffb0b484b1ad74faa /lib/gitlab/workhorse.rb | |
| parent | eee07f1c7cacdd24cbd66917ba66e703128f65c6 (diff) | |
| download | gitlab-ce-1904c80f3dd5437cb39aa90de933279bf9635678.tar.gz | |
Change socket_path to gitaly_address
Diffstat (limited to 'lib/gitlab/workhorse.rb')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index eae1a0abf06..6fe85af3c30 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -1,6 +1,7 @@ require 'base64' require 'json' require 'securerandom' +require 'uri' module Gitlab class Workhorse @@ -21,10 +22,10 @@ module Gitlab RepoPath: repository.path_to_repo, } - params.merge!( - GitalySocketPath: Gitlab.config.gitaly.socket_path, - GitalyResourcePath: "/projects/#{repository.project.id}/git-http/info-refs", - ) if Gitlab.config.gitaly.socket_path.present? + if Gitlab.config.gitaly.enabled + address = Gitlab::GitalyClient.get_address(repository.project.repository_storage) + params[:GitalySocketPath] = URI(address).path + end params end |