diff options
| author | Tiger <twatson@gitlab.com> | 2019-08-23 07:19:51 +0300 |
|---|---|---|
| committer | Tiger <twatson@gitlab.com> | 2019-08-23 07:19:51 +0300 |
| commit | 08fcb2379e8e39408a3c2457b036fd6a8c28d5f8 (patch) | |
| tree | 6950c9d6f0e2fb59bf5d379cdfdad9cf83126cec /lib/gitlab/database.rb | |
| parent | e12f7fe062574b0ad3e271b149928252a99119f5 (diff) | |
CE port: allow SRV records in DB service discovery
Diffstat (limited to 'lib/gitlab/database.rb')
| -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) |