scout_apm 1.2.8.pre1 → 1.2.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.markdown +4 -0
  3. data/lib/scout_apm/framework_integrations/rails_3_or_4.rb +4 -8
  4. data/lib/scout_apm/version.rb +1 -1
  5. metadata +5 -5
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 648de873df09b8d7419abd803d9180fb67e1595d
4
- data.tar.gz: 61cf23bc15c91ba74022f8390348cf4896bfd9d5
3
+ metadata.gz: 37dccd68e9841fb4be84b21b542423f4923dfee5
4
+ data.tar.gz: c29e6ac3d99fbbd612baf124c6e2d76e68933e27
5
5
  SHA512:
6
- metadata.gz: 8856fc5d888b1a6243b16e2b04d1d4d60f84167d1dea79032e504d6b21f2fb43292df433cb6c5b99454c39fa529529d5f534880b8867d7a3446834228c164366
7
- data.tar.gz: c7142c814ad6c572381688dea1baf5fdcd6f968bd6d79dff59fb7bfe68fb1e6822abf22d3ff8e0ec8d24e9bc6e1cfca748cb91e7091914ea65fe1cf0897678c1
6
+ metadata.gz: 34d1715eff899c93e04962bf4b3e80cc2e448cc4900a591fe180ade13973db7593a32a132d4f8b135298d4030911f580fbe472007d8bb42fc0c639245a48f236
7
+ data.tar.gz: 0c10d15966c2ac5797dda63978ccde80af58dfa59f584d9ddb63cd39d29de2cf97c7b1e47a22f29ade4952ebe28c2bcb78d4be6c0c6366aabd221aa4417dfa0d
data/CHANGELOG.markdown CHANGED
@@ -1,3 +1,7 @@
1
+ # 1.2.9
2
+
3
+ * Uses ActiveRecord::Base.configurations to access database adapter across all versions of Rails 3.0+.
4
+
1
5
  # 1.2.8
2
6
 
3
7
  * Enhance shutdown code to be sure we save current-minute metrics and minimize
data/lib/scout_apm/framework_integrations/rails_3_or_4.rb CHANGED
@@ -36,7 +36,7 @@ module ScoutApm
36
36
  default = :mysql
37
37
 
38
38
  if defined?(ActiveRecord::Base)
39
- adapter = getDatabaseAdapter # can be nil
39
+ adapter = get_database_adapter # can be nil
40
40
 
41
41
  case adapter.to_s
42
42
  when "postgres" then :postgres
@@ -52,13 +52,9 @@ module ScoutApm
52
52
  end
53
53
  end
54
54
 
55
- def getDatabaseAdapter
56
- if ActiveRecord::Base.respond_to?(:connection_config)
57
- ActiveRecord::Base.connection_config[:adapter]
58
- elsif ActiveRecord::Base.respond_to?(:configurations)
59
- ActiveRecord::Base.configurations[env]["adapter"]
60
- end
61
- rescue
55
+ def get_database_adapter
56
+ ActiveRecord::Base.configurations[env]["adapter"]
57
+ rescue # this would throw an exception if ActiveRecord::Base is defined but no configuration exists.
62
58
  nil
63
59
  end
64
60
  end
data/lib/scout_apm/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module ScoutApm
2
- VERSION = "1.2.8.pre1"
2
+ VERSION = "1.2.9"
3
3
  end
4
4
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scout_apm
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.8.pre1
4
+ version: 1.2.9
5
5
  platform: ruby
6
6
  authors:
7
7
  - Derek Haynes
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2016-01-19 00:00:00.000000000 Z
12
+ date: 2016-01-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: minitest
@@ -170,12 +170,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
170
170
  version: '0'
171
171
  required_rubygems_version: !ruby/object:Gem::Requirement
172
172
  requirements:
173
- - - ">"
173
+ - - ">="
174
174
  - !ruby/object:Gem::Version
175
- version: 1.3.1
175
+ version: '0'
176
176
  requirements: []
177
177
  rubyforge_project: scout_apm
178
- rubygems_version: 2.2.2
178
+ rubygems_version: 2.4.8
179
179
  signing_key:
180
180
  specification_version: 4
181
181
  summary: Ruby application performance monitoring