diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-26 08:32:16 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2019-08-26 08:32:16 +0000 |
| commit | e74bf9a8a3c48715c009576907aff544621f37b2 (patch) | |
| tree | 964ba252ab8288e1bf5cdf0b35c2e33b8de3216c /lib | |
| parent | 0122ec455c72c635c045eeb65768e7b78534125b (diff) | |
| parent | 08fcb2379e8e39408a3c2457b036fd6a8c28d5f8 (diff) | |
| download | gitlab-ce-e74bf9a8a3c48715c009576907aff544621f37b2.tar.gz | |
Merge branch 'db_load_balancing_service_discovery_srv' into 'master'
DB Load Balancing: Support SRV lookups
See merge request gitlab-org/gitlab-ce!32135
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/database.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index cbdff0ab060..a12bbededc4 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -195,13 +195,14 @@ module Gitlab # pool_size - The size of the DB pool. # host - An optional host name to use instead of the default one. - def self.create_connection_pool(pool_size, host = nil) + def self.create_connection_pool(pool_size, host = nil, port = nil) # See activerecord-4.2.7.1/lib/active_record/connection_adapters/connection_specification.rb env = Rails.env original_config = ActiveRecord::Base.configurations env_config = original_config[env].merge('pool' => pool_size) env_config['host'] = host if host + env_config['port'] = port if port config = original_config.merge(env => env_config) |