what 0.1.1 → 0.2.0

data/example/what.yml

@@ -23,11 +23,13 @@ modules:
     alert: 0
 - name: hello world
   type: custom_module
+  interval: 1
   config:
     hello: hello
     world: world
 - name: world hello
   type: custom_module
+  interval: 5
   config:
     hello: world
     world: hello

data/lib/what/modules/base.rb

@@ -1,10 +1,16 @@
 module What
   class Modules::Base
+
+    attr_reader :interval
+
     def initialize(params={})
       defaults = (self.class)::DEFAULTS rescue {}
       @name = params['name']
       @config = defaults.merge(params['config'] || {})
       @max = params['max'] || 'alert'
+      # Use global interval setting if not set on a
+      # per module basis
+      @interval = params['interval'] || Config['interval']
       initialize_module
     end
 

data/lib/what/monitor.rb

@@ -8,18 +8,29 @@ module What
       end
 
       Thread.abort_on_exception = true
-      @thread = Thread.new(@modules) { |modules| self.do_it(modules) }
+      @threads = @modules.collect do |mod|
+        Thread.new do
+          loop do
+            mod.check!
+            Thread.current[:status] = mod.status
+            sleep mod.interval
+          end
+        end
+      end
+
+      Thread.new { self.do_it }
     end
 
-    def self.do_it(modules)
+    def self.do_it
       Status['details'] = []
       loop do
         statuses = []
         healths = []
-        modules.each do |mod|
-          mod.check!
-          healths << mod.status['health']
-          statuses << mod.status
+        @threads.each do |th|
+          if th[:status]
+            healths << th[:status]['health']
+            statuses << th[:status]
+          end
         end
         Status['health'] = Helpers.overall_health(healths)
         Status['details'] = statuses

data/lib/what/version.rb

@@ -1,3 +1,3 @@
 module What
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/what.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = What::VERSION
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ryan Fitzgerald", "Ryan Lower"]
-  s.email       = ["team@academia.edu"]
+  s.email       = ["rwfitzge@gmail.com", "rpjlower@gmail.com"]
   s.homepage    = "http://academia.edu/"
   s.summary     = %q{Simple server monitoring tool}
   s.description = <<-EOS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: what
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-01 00:00:00.000000000Z
+date: 2012-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70189107394580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 1.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *70189107394580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &70189107394060 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: 0.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *70189107394060
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70189107393640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +54,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70189107393640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'What uses WEBrick to serve a JSON object representing the state of
   services
 
@@ -56,7 +71,8 @@ description: ! 'What uses WEBrick to serve a JSON object representing the state
 
 '
 email:
-- team@academia.edu
+- rwfitzge@gmail.com
+- rpjlower@gmail.com
 executables:
 - what
 extensions: []
@@ -110,9 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: what
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple server monitoring tool
 test_files: []
-has_rdoc: