newrelic_rpm 3.3.2.beta2 → 3.3.2

data/lib/new_relic/agent/agent.rb

@@ -1272,7 +1272,7 @@ module NewRelic
         def save_or_transmit_data
           if NewRelic::DataSerialization.should_send_data?
             log.debug "Sending data to New Relic Service"
-            NewRelic::Agent.load_data
+            NewRelic::Agent.load_data unless NewRelic::Control.instance.disable_serialization?
             harvest_and_send_errors
             harvest_and_send_slowest_sample
             harvest_and_send_slowest_sql

data/lib/new_relic/data_serialization.rb

@@ -42,21 +42,21 @@ module NewRelic
       end
       
       def pid_too_old?
-        create_pid_file unless File.exists?(pid_file_path)
+        return true unless File.exists?(pid_file_path)
         age = (Time.now.to_i - File.mtime(pid_file_path).to_i)
         NewRelic::Control.instance.log.debug("Pid was #{age} seconds old, sending data") if age > 60
         age > 60
       end
       
       def store_too_old?
-        FileUtils.touch(file_path) unless File.exists?(file_path)
+        return true unless File.exists?(file_path)
         age = (Time.now.to_i - File.mtime(file_path).to_i)
         NewRelic::Control.instance.log.debug("Store was #{age} seconds old, sending data") if age > 60
         age > 50
       end      
     
       def store_too_large?
-        FileUtils.touch(file_path) unless File.exists?(file_path)
+        return true unless File.exists?(file_path)
         size = File.size(file_path) > max_size
         NewRelic::Control.instance.log.debug("Store was oversize, sending data") if size
         size
@@ -136,16 +136,7 @@ module NewRelic
         NewRelic::Control.instance.log.debug(e.backtrace.inspect)
         nil
       end
-
-      def truncate_file
-        FileUtils.touch(file_path)
-        File.truncate(file_path, 0)
-      end
-      
-      def create_pid_file
-        File.open(pid_file_path, 'w') {|f| f.write $$ }
-      end
-      
+            
       def file_path
         "#{NewRelic::Control.instance.log_path}/newrelic_agent_store.db"
       end

data/lib/new_relic/version.rb

@@ -4,7 +4,7 @@ module NewRelic
     MAJOR = 3
     MINOR = 3
     TINY  = 2
-    BUILD = 'beta2' # Set to nil for a release, 'beta1', 'alpha', etc for prerelease builds
+    BUILD = nil # 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,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{newrelic_rpm}
-  s.version = "3.3.2.beta2"
+  s.version = "3.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bill Kayser", "Jon Guymon", "Justin George", "Darin Swanson"]
-  s.date = %q{2012-02-10}
+  s.date = %q{2012-02-16}
   s.description = %q{New Relic is a performance management system, developed by New Relic,
 Inc (http://www.newrelic.com).  New Relic provides you with deep
 information about the performance of your web application as it runs

data/test/new_relic/agent/agent_test.rb

@@ -16,6 +16,7 @@ module NewRelic
       end
       
       def test_save_or_transmit_data_should_transmit
+        NewRelic::Control.instance.stubs(:disable_serialization?).returns(false)
         NewRelic::Agent.expects(:load_data)
         @agent.expects(:harvest_and_send_timeslice_data)
         @agent.expects(:harvest_and_send_slowest_sample)

data/test/new_relic/data_serialization_test.rb

@@ -29,15 +29,6 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
     end
     assert_equal(0, File.size(file), "Should not leave any data in the file")
   end
-
-  def test_bad_paths
-    NewRelic::Control.instance.stubs(:log_path).returns("/bad/path")
-    assert NewRelic::DataSerialization.should_send_data?
-    NewRelic::DataSerialization.read_and_write_to_file do
-      'a happy string'
-    end
-    assert !File.exists?(file)
-  end
   
   def test_read_and_write_to_file_dumping_contents
     expected_contents = Marshal.dump('a happy string')
@@ -144,12 +135,20 @@ class NewRelic::DataSerializationTest < Test::Unit::TestCase
   def test_pid_age_creates_pid_file_if_none_exists
     assert(!File.exists?("#{@path}/newrelic_agent_store.pid"),
            'pid file found, should not be there')
-    assert(!NewRelic::DataSerialization.pid_too_old?,
-           "new pid should not be too old")
+    NewRelic::DataSerialization.update_last_sent!
     assert(File.exists?("#{@path}/newrelic_agent_store.pid"),
            'pid file not found, should be there')
   end
-
+  
+  def test_should_not_create_files_if_serialization_disabled
+    NewRelic::Control.instance['disable_serialization'] = true
+    NewRelic::DataSerialization.should_send_data?
+    assert(!File.exists?("#{@path}/newrelic_agent_store.db"),
+           'db file created when serialization disabled')
+    assert(!File.exists?("#{@path}/newrelic_agent_store.pid"),
+           'pid file created when serialization disabled')
+  end
+  
   def test_loading_does_not_seg_fault_if_gc_triggers
     return if NewRelic::LanguageSupport.using_version?('1.8.6')
     require 'timeout'

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: newrelic_rpm
 version: !ruby/object:Gem::Version 
-  hash: 62196455
-  prerelease: 6
+  hash: 15
+  prerelease: 
   segments: 
   - 3
   - 3
   - 2
-  - beta
-  - 2
-  version: 3.3.2.beta2
+  version: 3.3.2
 platform: ruby
 authors: 
 - Bill Kayser
@@ -20,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 -08:00
+date: 2012-02-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency