newrelic_rpm 2.13.0.beta5 → 2.13.1

data/lib/new_relic/agent/worker_loop.rb

@@ -1,22 +1,22 @@
 require 'thread'
 module NewRelic
   module Agent
-    
-    # A worker loop executes a set of registered tasks on a single thread.  
-    # A task is a proc or block with a specified call period in seconds.  
+
+    # A worker loop executes a set of registered tasks on a single thread.
+    # A task is a proc or block with a specified call period in seconds.
     class WorkerLoop
-      
+
       def initialize
         @log = log
         @should_run = true
-        @next_invocation_time = Time.now 
+        @next_invocation_time = Time.now
         @period = 60.0
       end
-      
+
       def lock
         @@lock ||= Mutex.new
       end
-      
+
       def log
         NewRelic::Control.instance.log
       end
@@ -38,19 +38,19 @@ module NewRelic
           run_task if keep_running
         end
       end
-      
+
       def keep_running
         @should_run
       end
-      
+
       def stop
         @should_run = false
       end
-      
+
       def run_task
         begin
           lock.synchronize do
-            @task.call 
+            @task.call
           end
         rescue ServerError => e
           log.debug "Server Error: #{e}"
@@ -68,13 +68,13 @@ module NewRelic
           raise
         rescue Exception => e
           # Don't blow out the stack for anything that hasn't already propagated
-          log.error "Error running task in Agent Worker Loop '#{e}': #{e.backtrace.first}" 
+          log.error "Error running task in Agent Worker Loop '#{e}': #{e.backtrace.first}"
           log.debug e.backtrace.join("\n")
         end
         now = Time.now
         while @next_invocation_time <= now && @period > 0
           @next_invocation_time += @period
-        end        
+        end
       end
     end
   end

data/lib/new_relic/collection_helper.rb

@@ -24,10 +24,10 @@ module NewRelic
       truncate(flatten(params))
     end
   end
-  
+
   # Return an array of strings (backtrace), cleaned up for readability
   # Return nil if there is no backtrace
-  
+
   def strip_nr_from_backtrace(backtrace)
     if backtrace
       # this is for 1.9.1, where strings no longer have Enumerable
@@ -40,12 +40,12 @@ module NewRelic
     end
     backtrace
   end
-  
+
   private
-  
+
   # Convert any kind of object to a short string.
   def flatten(object)
-    s = case object 
+    s = case object
       when nil then ''
       when object.instance_of?(String) then object
       when String then String.new(object)  # convert string subclasses to strings
@@ -64,7 +64,7 @@ module NewRelic
       end
       real_string
     else
-      truncate(flatten(string), len)     
+      truncate(flatten(string), len)
     end
   end
   end

data/lib/new_relic/command.rb

@@ -15,15 +15,15 @@ module NewRelic
         @options = opt_parser
       end
     end
-    
+
     def info(message)
       STDOUT.puts message
     end
-    
+
     def err(message)
       STDERR.puts message
-    end    
-    
+    end
+
     def initialize(command_line_args)
       if Hash === command_line_args
         # command line args is an options hash
@@ -37,22 +37,22 @@ module NewRelic
         end
         @leftover = @options.parse(command_line_args)
       end
-    rescue OptionParser::ParseError => e 
+    rescue OptionParser::ParseError => e
       raise CommandFailure.new e.message, @options
     end
-    
+
     @commands = []
     def self.inherited(subclass)
       @commands << subclass
     end
-    
+
     cmds = File.expand_path(File.join(File.dirname(__FILE__), 'commands', '*.rb'))
     Dir[cmds].each{|command| require command }
-    
+
     def self.run
-      
-      @command_names = @commands.map(&:command)
-      
+
+      @command_names = @commands.map{ |c| c.command }
+
       extra = []
       options = ARGV.options do |opts|
         script_name = File.basename($0)
@@ -74,12 +74,12 @@ module NewRelic
         STDERR.puts "Unrecognized command: #{command}"
         STDERR.puts options
       else
-        command_class = @commands.find{ |c| c.command == command} 
+        command_class = @commands.find{ |c| c.command == command}
         command_class.new(extra).run
       end
     rescue OptionParser::InvalidOption => e
       raise NewRelic::Command::CommandFailure, e.message
     end
   end
-  
-end
+
+end

data/lib/new_relic/commands/deployments.rb

@@ -1,19 +1,19 @@
-# This is a class for executing commands related to deployment 
+# This is a class for executing commands related to deployment
 # events.  It runs without loading the rails environment
 
 require 'yaml'
 require 'net/http'
 require 'rexml/document'
 
-# We need to use the Control object but we don't want to load 
+# We need to use the Control object but we don't want to load
 # the rails/merb environment.  The defined? clause is so that
 # it won't load it twice, something it does when run inside a test
 require 'new_relic/control' unless defined? NewRelic::Control
 
 class NewRelic::Command::Deployments < NewRelic::Command
   attr_reader :config
-  def self.command; "deployments"; end 
-  
+  def self.command; "deployments"; end
+
   # Initialize the deployment uploader with command line args.
   # Use -h to see options.
   # When command_line_args is a hash, we are invoking directly and
@@ -22,7 +22,7 @@ class NewRelic::Command::Deployments < NewRelic::Command
   # and :changes.
   #
   # Will throw CommandFailed exception if there's any error.
-  # 
+  #
   def initialize command_line_args
     @config = NewRelic::Control.instance
     super(command_line_args)
@@ -31,7 +31,7 @@ class NewRelic::Command::Deployments < NewRelic::Command
     config.env = @environment if @environment
     @appname ||= config.app_names[0] || config.env || 'development'
   end
-  
+
   # Run the Deployment upload in RPM via Active Resource.
   # Will possibly print errors and exit the VM
   def run
@@ -39,8 +39,8 @@ class NewRelic::Command::Deployments < NewRelic::Command
       @description = nil if @description && @description.strip.empty?
       create_params = {}
       {
-            :application_id => @appname, 
-            :host => Socket.gethostname, 
+            :application_id => @appname,
+            :host => Socket.gethostname,
             :description => @description,
             :user => @user,
             :revision => @revision,
@@ -49,25 +49,25 @@ class NewRelic::Command::Deployments < NewRelic::Command
         create_params["deployment[#{k}]"] = v unless v.nil? || v == ''
       end
       http = config.http_connection(config.api_server)
-      
+
       uri = "/deployments.xml"
-      
+
       raise "license_key was not set in newrelic.yml for #{config.env}" if config['license_key'].nil?
       request = Net::HTTP::Post.new(uri, {'x-license-key' => config['license_key']})
       request.content_type = "application/octet-stream"
-      
+
       request.set_form_data(create_params)
-      
+
       response = http.request(request)
-      
+
       if response.is_a? Net::HTTPSuccess
         info "Recorded deployment to '#{@appname}' (#{@description || Time.now })"
       else
         err_string = REXML::Document.new(response.body).elements['errors/error'].map(&:to_s).join("; ") rescue  response.message
         raise NewRelic::Command::CommandFailure, "Deployment not recorded: #{err_string}"
-      end 
+      end
     rescue SystemCallError, SocketError => e
-      # These include Errno connection errors 
+      # These include Errno connection errors
       err_string = "Transient error attempting to connect to #{config.api_server} (#{e})"
       raise NewRelic::Command::CommandFailure.new(err_string)
     rescue NewRelic::Command::CommandFailure
@@ -78,9 +78,9 @@ class NewRelic::Command::Deployments < NewRelic::Command
       raise NewRelic::Command::CommandFailure.new(e.to_s)
     end
   end
-  
+
   private
-  
+
   def options
     OptionParser.new %Q{Usage: #{$0} #{self.class.command} [OPTIONS] ["description"] }, 40 do |o|
       o.separator "OPTIONS:"
@@ -95,11 +95,11 @@ class NewRelic::Command::Deployments < NewRelic::Command
              "Default: #{@user || '<none>'}") { | u | @user = u }
       o.on("-r", "--revision=REV", String,
              "Specify the revision being deployed") { | r | @revision = r }
-      o.on("-c", "--changes", 
+      o.on("-c", "--changes",
              "Read in a change log from the standard input") { @changelog = STDIN.read }
       yield o if block_given?
     end
   end
-  
+
 
 end

data/lib/new_relic/commands/install.rb

@@ -5,9 +5,9 @@ require 'erb'
 class NewRelic::Command::Install < NewRelic::Command
 
   NO_LICENSE_KEY = "<PASTE LICENSE KEY HERE>"
-  
-  def self.command; "install"; end 
-  
+
+  def self.command; "install"; end
+
   # Use -h to see options.
   # When command_line_args is a hash, we are invoking directly and
   # it's treated as an options with optional string values for
@@ -15,7 +15,7 @@ class NewRelic::Command::Install < NewRelic::Command
   # and :changes.
   #
   # Will throw CommandFailed exception if there's any error.
-  # 
+  #
   attr_reader :dest_dir, :license_key, :generated_for_user, :quiet, :src_file, :app_name
   def initialize command_line_args={}
     super command_line_args
@@ -32,20 +32,20 @@ class NewRelic::Command::Install < NewRelic::Command
     raise CommandFailure.new("Application name required.", @options) unless @app_name && @app_name.size > 0
     @generated_for_user ||= @user_string || ""
   end
-  
+
   def run
     dest_file = File.expand_path(@dest_dir + "/newrelic.yml")
     if File.exist?(dest_file)
       raise NewRelic::Command::CommandFailure, "newrelic.yml file already exists.  Move it out of the way."
     end
     File.open(dest_file, 'w') { | out | out.puts(content) }
-    
+
     puts <<-EOF unless quiet
 
-Installed a default configuration file at 
+Installed a default configuration file at
 #{dest_file}.
     EOF
-    puts <<-EOF unless quiet || @license_key != NO_LICENSE_KEY 
+    puts <<-EOF unless quiet || @license_key != NO_LICENSE_KEY
 
 To monitor your application in production mode, sign up for an account
 at www.newrelic.com, and replace the newrelic.yml file with the one
@@ -56,17 +56,27 @@ you receive upon registration.
 E-mail support@newrelic.com with any problems or questions.
 
     EOF
-    
+    puts <<-EOF
+
+Installing the plugin from Rubyforge is deprecated. This repository will not be updated after January 2011
+
+Please use one of the following options:
+
+Gems: gem install newrelic_rpm
+
+Github! git clone git://github.com/newrelic/rpm.git vendor/plugins/newrelic_rpm
+
+    EOF
   end
-  
+
   def content
-    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","newrelic.yml")) 
+    @src_file ||= File.expand_path(File.join(File.dirname(__FILE__),"..","..","..","newrelic.yml"))
     template = File.read(@src_file)
     ERB.new(template).result(binding)
   end
-  
+
   private
-  
+
   def options
     OptionParser.new "Usage: #{$0} #{self.class.command} [ OPTIONS] 'application name'", 40 do |o|
       o.on("-l", "--license_key=NAME", String,
@@ -76,6 +86,6 @@ E-mail support@newrelic.com with any problems or questions.
       yield o if block_given?
     end
   end
-  
-  
+
+
 end

data/lib/new_relic/control.rb

@@ -11,30 +11,30 @@ require 'new_relic/control/configuration'
 require 'new_relic/control/server_methods'
 require 'new_relic/control/instrumentation'
 
-module NewRelic 
-  
+module NewRelic
+
   # The Control is a singleton responsible for the startup and
-  # initialization sequence.  The initializer uses a LocalEnvironment to 
+  # initialization sequence.  The initializer uses a LocalEnvironment to
   # detect the framework and instantiates the framework specific
   # subclass.
   #
   # The Control also implements some of the public API for the agent.
-  # 
+  #
   class Control
     # used for framework-specific subclasses
     module Frameworks; end
-    
+
     include Profiling
     include LoggingMethods
     include Configuration
     include ServerMethods
     include Instrumentation
-    
+
     # The env is the setting used to identify which section of the newrelic.yml
     # to load.  This defaults to a framework specific value, such as ENV['RAILS_ENV']
     # but can be overridden as long as you set it before calling #init_plugin
     attr_writer :env
-    
+
     attr_reader :local_env
 
     module ClassMethods
@@ -42,7 +42,7 @@ module NewRelic
       def instance
         @instance ||= new_instance
       end
-      
+
       # Create the concrete class for environment specific behavior:
       def new_instance
         @local_env = NewRelic::LocalEnvironment.new
@@ -72,7 +72,7 @@ module NewRelic
       end
     end
     extend ClassMethods
-    
+
     # Initialize the plugin/gem and start the agent.  This does the necessary configuration based on the
     # framework environment and determines whether or not to start the agent.  If the
     # agent is not going to be started then it loads the agent shim which has stubs
@@ -81,8 +81,8 @@ module NewRelic
     # This may be invoked multiple times, as long as you don't attempt to uninstall
     # the agent after it has been started.
     #
-    # If the plugin is initialized and it determines that the agent is not enabled, it 
-    # will skip starting it and install the shim.  But if you later call this with 
+    # If the plugin is initialized and it determines that the agent is not enabled, it
+    # will skip starting it and install the shim.  But if you later call this with
     # <tt>:agent_enabled => true</tt>, then it will install the real agent and start it.
     #
     # What determines whether the agent is launched is the result of calling agent_enabled?
@@ -94,17 +94,17 @@ module NewRelic
     #
     def init_plugin(options={})
       options['app_name'] = ENV['NEWRELIC_APP_NAME'] if ENV['NEWRELIC_APP_NAME']
-      
+
       require 'new_relic/agent'
-      
+
       # Load the DJ injection now.  If you do it sooner, DJ might not be loaded and
       # you'll miss it.
       require 'new_relic/delayed_job_injection'
-      
+
       # Merge the stringified options into the config as overrides:
       logger_override = options.delete(:log)
       environment_name = options.delete(:env) and self.env = environment_name
-      dispatcher = options.delete(:dispatcher) and @local_env.dispatcher = dispatcher 
+      dispatcher = options.delete(:dispatcher) and @local_env.dispatcher = dispatcher
       dispatcher_instance_id = options.delete(:dispatcher_instance_id) and @local_env.dispatcher_instance_id = dispatcher_instance_id
 
       # Clear out the settings, if they've already been loaded.  It may be that
@@ -135,12 +135,12 @@ module NewRelic
         install_shim
       end
     end
-    
+
     # Install the real agent into the Agent module, and issue the start command.
     def start_agent
       NewRelic::Agent.agent.start
     end
-    
+
     # True if dev mode or monitor mode are enabled, and we are running
     # inside a valid dispatcher like mongrel or passenger.  Can be overridden
     # by NEWRELIC_ENABLE env variable, monitor_daemons config option when true, or
@@ -148,14 +148,14 @@ module NewRelic
     def agent_enabled?
       return false if !developer_mode? && !monitor_mode?
       return self['agent_enabled'].to_s =~ /true|on|yes/i if !self['agent_enabled'].nil? && self['agent_enabled'] != 'auto'
-      return false if ENV['NEWRELIC_ENABLE'].to_s =~ /false|off|no/i 
+      return false if ENV['NEWRELIC_ENABLE'].to_s =~ /false|off|no/i
       return true if self['monitor_daemons'].to_s =~ /true|on|yes/i
       return true if ENV['NEWRELIC_ENABLE'].to_s =~ /true|on|yes/i
       # When in 'auto' mode the agent is enabled if there is a known
       # dispatcher running
       return true if @local_env.dispatcher != nil
     end
-    
+
     def app
       @local_env.framework
     end
@@ -164,17 +164,17 @@ module NewRelic
     def to_s
       "Control[#{self.app}]"
     end
-    
+
     protected
-    
+
     # Append framework specific environment information for uploading to
     # the server for change detection.  Override in subclasses
     def append_environment_info; end
-    
+
     def config_file
       File.expand_path(File.join(root,"config","newrelic.yml"))
     end
-    
+
     def initialize local_env, config_file_override=nil
       @local_env = local_env
       @instrumentation_files = []
@@ -194,10 +194,10 @@ module NewRelic
       puts e.backtrace.join("\n")
       raise "Error reading newrelic.yml file: #{e}"
     end
-    
+
     def newrelic_root
       self.class.newrelic_root
     end
-    
+
   end
 end