Fix regression in startup sequence

newrelic · Jun 10, 2010 · d0346de · d0346de
1 parent 3fac410
commit d0346de
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.12.3
+  * fix regression in startup sequence
+
 v2.12.2
   * fix for regression in Rails 2.1 inline rendering
   * workaround bug found in some rubies that caused a segv and/or NoMemoryError

diff --git a/lib/new_relic/agent/agent.rb b/lib/new_relic/agent/agent.rb
@@ -224,15 +224,13 @@ def start
 
         # Our shutdown handler needs to run after other shutdown handlers
         # that may be doing things like running the app (hello sinatra).
-        if control.send_data_on_exit
-          if RUBY_VERSION =~ /rubinius/i 
-            list = at_exit { shutdown }
-            # move the shutdown handler to the front of the list, to
-            # execute last:
-            list.unshift(list.pop)
-          elsif !defined?(JRuby) or !defined?(Sinatra::Application)
-            at_exit { at_exit { shutdown } } 
-          end
+        if RUBY_VERSION =~ /rubinius/i 
+          list = at_exit { shutdown }
+          # move the shutdown handler to the front of the list, to
+          # execute last:
+          list.unshift(list.pop)
+        elsif !defined?(JRuby) or !defined?(Sinatra::Application)
+          at_exit { at_exit { shutdown } } 
         end
       end
       control.log! "New Relic RPM Agent #{NewRelic::VERSION::STRING} Initialized: pid = #$$"

diff --git a/lib/new_relic/version.rb b/lib/new_relic/version.rb
@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 12
-    TINY  = 2
+    TINY  = 3
     BUILD = nil #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

diff --git a/newrelic_rpm.gemspec b/newrelic_rpm.gemspec
@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.12.2"
+  s.version = "2.12.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-06-10}
   s.description = %q{New Relic RPM is a Ruby performance management system, developed by
 New Relic, Inc (http://www.newrelic.com).  RPM provides you with deep
 information about the performance of your Ruby on Rails or Merb