Change socket_path to gitaly_address

1 files changed, 11 insertions, 5 deletions

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index c947075bf62..a0dbe0a8c11 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -4,9 +4,11 @@ module Gitlab
   module GitalyClient
     SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'.freeze
 
-    def self.configure_channel(shard, socket_path)
-      @channel ||= {}
-      @channel[shard] = new_channel("unix://#{socket_path}")
+    def self.configure_channel(storage, address)
+      @addresses ||= {}
+      @addresses[storage] = address
+      @channels ||= {}
+      @channels[storage] = new_channel(address)
     end
 
     def self.new_channel(address)
@@ -16,8 +18,12 @@ module Gitlab
       GRPC::Core::Channel.new(address, {}, :this_channel_is_insecure)
     end
 
-    def self.get_channel(shard)
-      @channel.fetch(shard)
+    def self.get_channel(storage)
+      @channels[storage]
+    end
+
+    def self.get_address(storage)
+      @addresses[storage]
     end
 
     def self.enabled?