scout_rails 1.0.2.pre2 → 1.0.2.pre3

data/CHANGELOG.markdown

@@ -2,6 +2,7 @@
 
 * Net::HTTP instrumentation
 * ActionController::Metal instrumentation
+* Determining number of processors
 
 # 1.0.1
 

data/lib/scout_rails/agent.rb

@@ -37,7 +37,7 @@ module ScoutRails
       @layaway = ScoutRails::Layaway.new
       @config = ScoutRails::Config.new(options[:config_path])
       @metric_lookup = Hash.new
-      @process_cpu=ScoutRails::Instruments::Process::ProcessCpu.new(1) # TODO: the argument is the number of processors
+      @process_cpu=ScoutRails::Instruments::Process::ProcessCpu.new(environment.processors)
       @process_memory=ScoutRails::Instruments::Process::ProcessMemory.new
     end
     
@@ -191,7 +191,7 @@ module ScoutRails
     def run_samplers
       begin
         cpu_util=@process_cpu.run # returns a hash
-        logger.debug "Process CPU: #{cpu_util.inspect}"
+        logger.debug "Process CPU: #{cpu_util.inspect} [#{environment.processors} CPU(s)]"
         store.track!("CPU/Utilization",cpu_util) if cpu_util
       rescue => e
         logger.info "Error reading ProcessCpu"

data/lib/scout_rails/environment.rb

@@ -23,6 +23,19 @@ module ScoutRails
                       end
     end
     
+    def processors
+      return @processors if @processors
+      unless @processors
+        if `cat /proc/cpuinfo | grep 'model name' | wc -l` =~ /(\d+)/
+          @processors = $1.to_i
+        end
+        if @processors < 1
+          @processors = 1
+        end 
+      end
+      @processors
+    end
+    
     def root
       if framework == :rails
         RAILS_ROOT.to_s

data/lib/scout_rails/version.rb

@@ -1,3 +1,3 @@
 module ScoutRails
-  VERSION = "1.0.2.pre2"
+  VERSION = "1.0.2.pre3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.2.pre2
+  version: 1.0.2.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-26 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies: []
 description: Monitors a Ruby on Rails application and reports detailed metrics on
   performance to Scout, a hosted monitoring service.