newrelic_rpm 2.13.0.beta4 → 2.13.0.beta5

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.

Potentially problematic release.


This version of newrelic_rpm might be problematic. Click here for more details.

@@ -32,14 +32,25 @@ module NewRelic
32
32
  @instrumentation_files << pattern
33
33
  end
34
34
  end
35
+
36
+ def _delayed_instrumentation
37
+ Rails.configuration.after_initialize do
38
+ _install_instrumentation
39
+ end
40
+ rescue
41
+ _install_instrumentation
42
+ end
43
+
35
44
  def install_instrumentation
36
- if defined?(Rails.initialized?) && !Rails.initialized?
37
- Rails.configuration.after_initialize do
38
- _install_instrumentation
39
- end
45
+ if defined?(Rails) && !Rails.initialized?
46
+ _delayed_instrumentation
40
47
  else
41
48
  _install_instrumentation
42
49
  end
50
+ rescue NameError
51
+ # needed in the rails 3 case, where Rails.initialized? raises
52
+ # an error if rails has not been initialised. which is totally sane.
53
+ _delayed_instrumentation
43
54
  end
44
55
 
45
56
  def load_samplers
@@ -4,7 +4,7 @@ module NewRelic
4
4
  MAJOR = 2
5
5
  MINOR = 13
6
6
  TINY = 0
7
- BUILD = 'beta4' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
7
+ BUILD = 'beta5' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
9
9
  end
10
10
 
data/newrelic_rpm.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{newrelic_rpm}
8
- s.version = "2.13.0.beta4"
8
+ s.version = "2.13.0.beta5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Bill Kayser", "Justin George"]
12
- s.date = %q{2010-07-09}
12
+ s.date = %q{2010-07-14}
13
13
  s.description = %q{New Relic RPM is a Ruby performance management system, developed by
14
14
  New Relic, Inc (http://www.newrelic.com). RPM provides you with deep
15
15
  information about the performance of your Ruby on Rails or Merb
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: newrelic_rpm
3
3
  version: !ruby/object:Gem::Version
4
- hash: 299253504
4
+ hash: 299253505
5
5
  prerelease: true
6
6
  segments:
7
7
  - 2
8
8
  - 13
9
9
  - 0
10
- - beta4
11
- version: 2.13.0.beta4
10
+ - beta5
11
+ version: 2.13.0.beta5
12
12
  platform: ruby
13
13
  authors:
14
14
  - Bill Kayser
@@ -17,7 +17,7 @@ autorequire:
17
17
  bindir: bin
18
18
  cert_chain: []
19
19
 
20
- date: 2010-07-09 00:00:00 -07:00
20
+ date: 2010-07-14 00:00:00 -07:00
21
21
  default_executable:
22
22
  dependencies:
23
23
  - !ruby/object:Gem::Dependency