diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-03-22 18:23:40 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-03-29 14:48:05 +0200 |
| commit | 8f50ef5e75fedc6f8c2a5b1c52e119c4c1df7c4e (patch) | |
| tree | 28d6d978e1e80985a5fa53921013f126adb8563f /config/initializers | |
| parent | c837da34391094b9d58763a67db5cfb706ca146f (diff) | |
| download | gitlab-ce-8f50ef5e75fedc6f8c2a5b1c52e119c4c1df7c4e.tar.gz | |
Separate GRPC channels per repository storage
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/1_settings.rb | 2 | ||||
| -rw-r--r-- | config/initializers/8_gitaly.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/1_settings.rb b/config/initializers/1_settings.rb index 62020fa9a75..f74b378b2c8 100644 --- a/config/initializers/1_settings.rb +++ b/config/initializers/1_settings.rb @@ -440,7 +440,7 @@ Settings.rack_attack.git_basic_auth['bantime'] ||= 1.hour # Gitaly # Settings['gitaly'] ||= Settingslogic.new({}) -Settings.gitaly['socket_path'] ||= ENV['GITALY_SOCKET_PATH'] +Settings.gitaly['enabled'] ||= false # # Webpack settings diff --git a/config/initializers/8_gitaly.rb b/config/initializers/8_gitaly.rb index 07dd30f0a24..e4a505a8ba4 100644 --- a/config/initializers/8_gitaly.rb +++ b/config/initializers/8_gitaly.rb @@ -1,2 +1,4 @@ # Make sure we initialize a Gitaly channel before Sidekiq starts multi-threaded execution. -Gitlab::GitalyClient.channel unless Rails.env.test? +Gitlab.config.repositories.storages.each do |name, params| + Gitlab::GitalyClient.configure_channel(name, params['socket_path']) +end |