diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-14 11:23:34 +0000 |
|---|---|---|
| committer | Regis <boudinot.regis@yahoo.com> | 2017-02-14 16:00:45 -0700 |
| commit | e40f055f6cd1548981e50cae0202d7a647ca230e (patch) | |
| tree | 6aff6504e118112581e2b4ad1ed55fa1b1c204b4 | |
| parent | 3e84053c51e20ca321769e37bf9281082d4f2bde (diff) | |
| download | gitlab-ce-e40f055f6cd1548981e50cae0202d7a647ca230e.tar.gz | |
Merge branch 'fix-ar-connection-leaks' into 'master'
Fix ActiveRecord connection leaks
Closes #27949 and gitlab-com/infrastructure#1139
See merge request !9109
| -rw-r--r-- | changelogs/unreleased/fix-ar-connection-leaks.yml | 4 | ||||
| -rw-r--r-- | lib/gitlab/database.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/database_spec.rb | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-ar-connection-leaks.yml b/changelogs/unreleased/fix-ar-connection-leaks.yml new file mode 100644 index 00000000000..9da715560ad --- /dev/null +++ b/changelogs/unreleased/fix-ar-connection-leaks.yml @@ -0,0 +1,4 @@ +--- +title: Don't connect in Gitlab::Database.adapter_name +merge_request: +author: diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index dc2537d36aa..a3d6be9959b 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -6,7 +6,7 @@ module Gitlab MAX_INT_VALUE = 2147483647 def self.adapter_name - connection.adapter_name + ActiveRecord::Base.configurations[Rails.env]['adapter'] end def self.mysql? diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb index b142b3a2781..41252f31997 100644 --- a/spec/lib/gitlab/database_spec.rb +++ b/spec/lib/gitlab/database_spec.rb @@ -5,6 +5,12 @@ class MigrationTest end describe Gitlab::Database, lib: true do + describe '.adapter_name' do + it 'returns the name of the adapter' do + expect(described_class.adapter_name).to be_an_instance_of(String) + end + end + # These are just simple smoke tests to check if the methods work (regardless # of what they may return). describe '.mysql?' do |