1 files changed, 3 insertions, 13 deletions
diff --git a/config/initializers/8_gitaly.rb b/config/initializers/8_gitaly.rb
index 69c0a91d6f0..31c7c91d78f 100644
--- a/config/initializers/8_gitaly.rb
+++ b/config/initializers/8_gitaly.rb
@@ -1,18 +1,8 @@
 require 'uri'
 
-# Make sure we initialize our Gitaly channels before Sidekiq starts multi-threaded execution.
 if Gitlab.config.gitaly.enabled || Rails.env.test?
-  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 == 'unix'
-      raise "Unsupported Gitaly address: #{address.inspect}"
-    end
-
-    Gitlab::GitalyClient.configure_channel(name, address)
+  Gitlab.config.repositories.storages.keys.each do |storage|
+    # Force validation of each address
+    Gitlab::GitalyClient.address(storage)
   end
 end