server_metrics 1.0.3 → 1.1.0.pre

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.1.0
+
+* sys/proctable is no longer a dependency in the gemspec.
+* Linux systems with the /proc filesystem will return all process metrics
+* other systems with sys/proctable installed will try to use sys/proctable, wnd will generally return a list of process names and counts (but no memory/cpu)
+* all other systems: no process info returned
+
 ## 1.0.3
 
 * Assuming 100 jiffies/second vs. reading from /proc/timer_list

data/lib/server_metrics/collectors/memory.rb

@@ -60,15 +60,6 @@ class ServerMetrics::Memory < ServerMetrics::Collector
       report_data[:swap_used_percent] = swap_percent_used
     end
     @data = report_data
-
-  rescue Exception => e
-    if e.message =~ /No such file or directory/
-      error('Unable to find /proc/meminfo',%Q(Unable to find /proc/meminfo. Please ensure your operationg system supports procfs:
-         http://en.wikipedia.org/wiki/Procfs)
-      )
-    else
-      raise
-    end
   end
 
   # Parses top output. Does not report swap usage.

data/lib/server_metrics/collectors/processes.rb

@@ -1,5 +1,9 @@
-require 'sys/proctable'
-require 'server_metrics/lib/proctable_lite' # used on linux
+begin
+  require 'sys/proctable'
+rescue LoadError
+  # we'll use SysLite::ProcTable
+end
+require 'server_metrics/lib/proctable_lite'
 require 'server_metrics/system_info'
 
 # Collects information on processes. Groups processes running under the same command, and sums up their CPU & memory usage.
@@ -11,17 +15,30 @@ require 'server_metrics/system_info'
 #
 # 2) why are the process CPU numbers lower than [top|htop]? We normalize the CPU usage according to the number of CPUs your server has. Top and htop don't do that. So on a 8 CPU system, you'd expect these numbers to be almost an order of magnitude lower.
 #
-# 
 # http://www.linuxquestions.org/questions/linux-general-1/per-process-cpu-utilization-557577/
+#
+# SYSTEM COMPATIBILITY NOTES
+#
+# * on Linux systems with the /proc filesystem: will return all process metrics
+# * on other systems with sys/proctable installed: will generally return a process list and counts
+# * everywhere else: no process info returned
+#
+#
+#
 class ServerMetrics::Processes
-  # most commmon - used if page size can't be retreived. units are bytes.
+  # most common - used if page size can't be retrieved. units are bytes.
   DEFAULT_PAGE_SIZE = 4096 
 
   def initialize(options={})
     @last_run
     @last_jiffies
     @last_process_list
-    @proc_table_klass = ServerMetrics::SystemInfo.os =~ /linux/ ? SysLite::ProcTable : Sys::ProcTable # this is used in calculate_processes. On Linux, use our optimized version
+    if ServerMetrics::SystemInfo.os =~ /linux/
+      @proc_table_klass = SysLite::ProcTable
+    elsif Object.const_defined?('Sys') && Sys.const_defined?('ProcTable')
+      @proc_table_klass = Sys::ProcTable
+    end
+
   end
 
 
@@ -40,10 +57,14 @@ class ServerMetrics::Processes
   #      ....
   #     }
   # }
-
+  #
   def run
-    @processes = calculate_processes # returns a hash
-    @processes.keys.inject(@processes) { |processes, key| processes[key][:cmd] = key; processes }
+    if @proc_table_klass
+      @processes = calculate_processes # returns a hash
+      @processes.keys.inject(@processes) { |processes, key| processes[key][:cmd] = key; processes }
+    else
+      @processes = {}
+    end
   end
 
   # called from run(). This method lists all the processes running on the server, groups them by command,

data/lib/server_metrics/version.rb

@@ -1,3 +1,3 @@
 module ServerMetrics
-  VERSION = "1.0.3"
+  VERSION = "1.1.0.pre"
 end

data/server_metrics.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "sys-proctable"
-
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "awesome_print"

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: server_metrics
 version: !ruby/object:Gem::Version
-  version: 1.0.3
-  prerelease: 
+  version: 1.1.0.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,24 +11,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: sys-proctable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -173,12 +157,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 926714783005878761
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -194,4 +181,3 @@ test_files:
 - test/test_basics.rb
 - test/test_helper.rb
 - test/test_with_fixtures.rb
-has_rdoc: