newrelic_rpm 2.11.2.beta → 2.11.2.beta2

data/CHANGELOG

@@ -2,7 +2,7 @@ v2.11.2
   * fix for unicorn not reporting when the proc line had 'master' in it
   * allow overriding the log file directory via 'log_file_path' in newrelic.yml
   * allow overriding the log name via 'log_file_name' in newrelic.yml
-  * fix for over detection of spawner in passenger 2.0
+  * fix regression for passenger 2.0 and earlier
 
 v2.11.1
   * republished gem without generated rdocs

data/lib/new_relic/agent/instrumentation/metric_frame.rb

@@ -15,11 +15,22 @@ module NewRelic::Agent::Instrumentation
     # as a Rack::Request or an ActionController::AbstractRequest.
     attr_accessor :request
     
+    
+    @@check_server_connection = false
+    def self.check_server_connection=(value)
+      @@check_server_connection = value
+    end
     # Return the currently active metric frame, or nil.  Call with +true+
     # to create a new metric frame if one is not already on the thread.
     def self.current(create_if_empty=nil)
       f = Thread.current[:newrelic_metric_frame]
       return f if f || !create_if_empty
+      
+      # Reconnect to the server if necessary.  This is only done
+      # for old versions of passenger that don't implement an explicit after_fork
+      # event.
+      NewRelic::Agent.instance.after_fork(:keep_retrying => false) if @@check_server_connection
+      
       Thread.current[:newrelic_metric_frame] = new
     end
     

data/lib/new_relic/agent/instrumentation/passenger_instrumentation.rb

@@ -16,5 +16,11 @@ if defined?(PhusionPassenger)
       # We're in conservative spawning mode. We don't need to do anything.
     end
   end
+
+elsif (defined?(::Passenger) && defined?(::Passenger::AbstractServer)) || defined?(::IN_PHUSION_PASSENGER) 
+  # We're on an older version of passenger
+  NewRelic::Agent.logger.warn "An older version of Phusion Passenger has been detected.  We recommend using at least release 2.1.1."
+
+  NewRelic::Agent::Instrumentation::MetricFrame.check_server_connection = true
   
 end 

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 2
     MINOR = 11
     TINY  = 2
-    BUILD = 'beta' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = 'beta2' #'0' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end
   

data/newrelic_rpm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "2.11.2.beta"
+  s.version = "2.11.2.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser"]

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 11
   - 2
-  - beta
-  version: 2.11.2.beta
+  - beta2
+  version: 2.11.2.beta2
 platform: ruby
 authors: 
 - Bill Kayser