Agent release 2.9.5

newrelic · Sep 18, 2009 · 58bf607 · 58bf607
1 parent 4617dc6
commit 58bf607
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+v2.9.5
+  * Fix memory sampling on Snow Leopard (No more ps rsz option)
+
 v2.9.4
   * Clamp size of data sent to server
   * Reset statistics for passenger when forking to avoid erroneous data

diff --git a/lib/new_relic/agent/samplers/memory_sampler.rb b/lib/new_relic/agent/samplers/memory_sampler.rb
@@ -17,8 +17,10 @@ def initialize
         else
           NewRelic::Agent.instance.log.info "Using /proc/$$/status for reading process memory."
         end
-      elsif platform =~ /darwin/
+      elsif platform =~ /darwin9/ # 10.5
         @sampler = ShellPS.new("ps -o rsz")
+      elsif platform =~ /darwin10/ # 10.6
+        @sampler = ShellPS.new("ps -o rss")
       elsif platform =~ /freebsd/
         @sampler = ShellPS.new("ps -o rss")
       elsif platform =~ /solaris/

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 = 9
-    TINY  = 4
+    TINY  = 5
     STRING = [MAJOR, MINOR, TINY].join('.')
   end