1 files changed, 47 insertions, 15 deletions

diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 1ce47ef2b05..bcdf1b1faa8 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -4,28 +4,60 @@ module Gitlab
   module GitalyClient
     SERVER_VERSION_FILE = 'GITALY_SERVER_VERSION'.freeze
 
-    def self.gitaly_address
-      if Gitlab.config.gitaly.socket_path
-        "unix://#{Gitlab.config.gitaly.socket_path}"
+    # This function is not thread-safe because it updates Hashes in instance variables.
+    def self.configure_channels
+      @addresses = {}
+      @channels = {}
+      Gitlab.config.repositories.storages.each do |name, params|
+        address = params['gitaly_address']
+        unless address.present?
+          raise "storage #{name.inspect} is missing a gitaly_address"
+        end
+
+        unless URI(address).scheme.in?(%w(tcp unix))
+          raise "Unsupported Gitaly address: #{address.inspect}"
+        end
+
+        @addresses[name] = address
+        @channels[name] = new_channel(address)
       end
     end
 
-    def self.channel
-      return @channel if defined?(@channel)
+    def self.new_channel(address)
+      address = address.sub(%r{^tcp://}, '') if URI(address).scheme == 'tcp'
+      # NOTE: When Gitaly runs on a Unix socket, permissions are
+      # handled using the file system and no additional authentication is
+      # required (therefore the :this_channel_is_insecure flag)
+      # TODO: Add authentication support when Gitaly is running on a TCP socket.
+      GRPC::Core::Channel.new(address, {}, :this_channel_is_insecure)
+    end
 
-      @channel =
-        if enabled?
-          # NOTE: Gitaly currently runs on a Unix socket, so permissions are
-          # handled using the file system and no additional authentication is
-          # required (therefore the :this_channel_is_insecure flag)
-          GRPC::Core::Channel.new(gitaly_address, {}, :this_channel_is_insecure)
-        else
-          nil
-        end
+    def self.get_channel(storage)
+      if !Rails.env.production? && @channels.nil?
+        # In development mode the Rails auto-loader may reset the instance
+        # variables of this class. What we do here is not thread-safe. In normal
+        # circumstances (including production) these instance variables have
+        # been initialized from config/initializers.
+        configure_channels
+      end
+
+      @channels[storage]
+    end
+
+    def self.get_address(storage)
+      if !Rails.env.production? && @addresses.nil?
+        # In development mode the Rails auto-loader may reset the instance
+        # variables of this class. What we do here is not thread-safe. In normal
+        # circumstances (including development) these instance variables have
+        # been initialized from config/initializers.
+        configure_channels
+      end
+
+      @addresses[storage]
     end
 
     def self.enabled?
-      gitaly_address.present?
+      Gitlab.config.gitaly.enabled
     end
 
     def self.feature_enabled?(feature)