bin/riemann-health in riemann-tools-0.2.10 vs bin/riemann-health in riemann-tools-0.2.11

@@ -37,11 +37,11 @@
       @cpu = method :freebsd_cpu
       @disk = method :disk
       @load = method :freebsd_load
       @memory = method :freebsd_memory
     else
-      @cores = cores
+      @cores = `nproc`.to_i
       puts "WARNING: OS '#{@ostype}' not explicitly supported. Falling back to Linux" unless @ostype == "linux"
       @cpu = method :linux_cpu
       @disk = method :disk
       @load = method :linux_load
       @memory = method :linux_memory
@@ -66,26 +66,9 @@
       :service => service.to_s,
       :state => state.to_s,
       :metric => metric.to_f,
       :description => description
     )
-  end
-
-  def cores
-    i = 0;
-    File.read("/proc/cpuinfo").split(/\n\n/).inject({}) do |cores, p|
-      physical_id = p[/physical id\s+:\s+(\d+)/, 1]
-      core_id = p[/core id\s+:\s+(\d+)/, 1]
-      if physical_id and core_id
-        cores["#{physical_id}:#{core_id}"] = true
-      elsif physical_id
-        cores["#{physical_id}:"] = true
-      else
-        cores[i += 1] = true;
-      end
-
-      cores
-    end.size
   end
 
   def report_pct(service, fraction, report)
     if fraction
       if fraction > @limits[service][:critical]