newrelic_rpm 2.8.6 → 2.8.7

data/lib/new_relic/agent.rb

@@ -20,7 +20,8 @@ require 'new_relic/agent/error_collector'
 require 'set'
 require 'sync'
 require 'thread'
-require 'resolv'    
+require 'resolv'
+require 'timeout'
 
 
 module NewRelic::Agent

data/lib/new_relic/agent/agent.rb

@@ -176,7 +176,7 @@ module NewRelic::Agent
       @identifier = identifier && identifier.to_s
       if @identifier
         start_reporting(force)
-        config.log! "New Relic RPM Agent #{NewRelic::VERSION::STRING} Initialized: pid = #{$$}"
+        config.log! "New Relic RPM Agent #{NewRelic::VERSION::STRING} Initialized: pid = #{$$}, handler = #{@environment}"
         config.log! "Agent Log is found in #{NewRelic::Config.instance.log_file}"
         return true
       else
@@ -660,7 +660,6 @@ module NewRelic::Agent
       # pay a little more CPU.
       post_data = Zlib::Deflate.deflate(Marshal.dump(args), Zlib::BEST_SPEED)
       http = config.http_connection
-      http.read_timeout = @request_timeout
       
       # params = {:method => method, :license_key => license_key, :protocol_version => PROTOCOL_VERSION }
       # uri = "/agent_listener/invoke_raw_method?#{params.to_query}"
@@ -673,7 +672,16 @@ module NewRelic::Agent
       
       log.debug "#{uri}"
       
-      response = http.request(request)
+      response = nil
+      
+      begin
+        timeout(@request_timeout) do      
+          response = http.request(request)
+        end
+      rescue Timeout::Error
+        log.warn "Timed out trying to post data to RPM (timeout = #{@request_timeout} seconds)"
+        raise IgnoreSilentlyException
+      end
       
       if response.is_a? Net::HTTPSuccess
         body = nil

data/lib/new_relic/config/rails.rb

@@ -66,7 +66,7 @@ class NewRelic::Config::Rails < NewRelic::Config
     # a webserver process
     if local_env.identifier
       port = local_env.identifier.to_s =~ /^\d+/ ? ":#{local_env.identifier}" : ":port" 
-      to_stderr "NewRelic Agent (Developer Mode) enabled."
+      to_stderr "NewRelic Agent Developer Mode enabled."
       to_stderr "To view performance information, go to http://localhost#{port}/newrelic"
     end
   end

data/lib/new_relic/local_environment.rb

@@ -14,7 +14,7 @@ module NewRelic
       # Note: log won't be available yet.
       @identifier = nil
       @environment = :unknown
-      environments = %w[merb jruby webrick mongrel thin litespeed passenger daemon]
+      environments = %w[merb jruby webrick thin mongrel litespeed passenger fastcgi daemon]
       while environments.any? && @identifier.nil?
         send 'check_for_'+(environments.shift)
       end
@@ -22,28 +22,45 @@ module NewRelic
     def to_s
       "LocalEnvironment[#{environment}:#{identifier}]"
     end
+    def check_for_fastcgi
+      return unless defined? FCGI
+      @environment = :fastcgi
+      @identifier = 'fastcgi'
+    end
     def check_for_merb
       if config.app == :merb
         @identifier = 'merb'
       end
     end
     def check_for_webrick
-      if defined?(OPTIONS) && OPTIONS.respond_to?(:fetch) 
+      return unless defined?(WEBrick)
+      @environment = :webrick
+      if defined?(OPTIONS) && ::OPTIONS.respond_to?(:fetch) 
         # OPTIONS is set by script/server 
         @identifier = OPTIONS.fetch(:port)
-        @environment = :webrick
       end
+      @identifier = default_port unless @identifier
     end
-    
     # this case covers starting by mongrel_rails
     def check_for_mongrel
-      if defined? Mongrel::HttpServer
-        ObjectSpace.each_object(Mongrel::HttpServer) do |mongrel|
-          next if not mongrel.respond_to? :port
-          @environment = :mongrel
-          @identifier = mongrel.port
+      return unless defined?(Mongrel::HttpServer) 
+      @environment = :mongrel
+      
+      # Get the port from the server if it's started
+      ObjectSpace.each_object(Mongrel::HttpServer) do |mongrel|
+        next if not mongrel.respond_to? :port
+        @identifier = mongrel.port.to_s
+      end
+      
+      # Get the port from the configurator if one was created
+      if @identifier.nil? && defined?(Mongrel::Configurator)
+        ObjectSpace.each_object(Mongrel::Configurator) do |mongrel|
+          @identifier = mongrel.defaults[:port] && mongrel.defaults[:port].to_s
         end
       end
+      
+      # Still can't find the port.  Let's look at ARGV to fall back
+      @identifier = default_port if @identifier.nil?
     end
     
     def check_for_thin
@@ -104,5 +121,16 @@ module NewRelic
     def config
       NewRelic::Config.instance
     end
+    
+    def default_port
+      require 'optparse'
+      # If nothing else is found, use the 3000 default
+      default_port = 3000
+      ARGV.clone.options do |opts|
+        opts.on("-p", "--port=port", String) { | default_port | }
+        opts.parse!
+      end
+      default_port
+    end
   end
 end

data/lib/new_relic/version.rb

@@ -3,7 +3,7 @@ module NewRelic
   module VERSION #:nodoc:
   MAJOR = 2
   MINOR = 8
-  TINY  = 6
+  TINY  = 7
   STRING = [MAJOR, MINOR, TINY].join('.')
   def self.changes
     puts "NewRelic RPM Plugin Version: #{NewRelic::VERSION::STRING}"
@@ -11,6 +11,11 @@ module NewRelic
   end
 
   CHANGELOG = <<EOF
+2009-03-20 version 2.8.7
+  * fix for ssl connection hanging problems
+  * fix problem recognizing mongrel in rails 2.3.2
+  * fastcgi support in rails 2.3.2
+  * put back webrick support
 2009-03-16 version 2.8.6
   * fix for capture_params when using file uploads in controller actions
   * use Resolv::getaddress rather than allowing the default DNS to stall 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  version: 2.8.6
+  version: 2.8.7
 platform: ruby
 authors: 
 - Bill Kayser
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2009-03-23 00:00:00 -07:00
 default_executable: newrelic_cmd
 dependencies: []