god 0.7.15 → 0.7.16

data/History.txt

@@ -1,3 +1,12 @@
+== 0.7.16 / 2009-08-24
+  * Minor Enhancements
+    * Better logging for disk_usage condition [github.com/lettherebecode]
+  * Bug Fixes
+    * Only sleep if driver delay is > 0 [github.com/ps2]
+    * Rescue Timeout::Error exception due to smtp server timing out [github.com/ps2]
+    * Disk usage condition should use `df -P` to prevent line splitting [github.com/mseppae]
+    * Always require YAML so binary works on dumb systems
+
 == 0.7.15 / 2009-08-19
   * Minor Enhancements
     * Support SSL Campfire connections [github.com/eric]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 7
-:patch: 15
+:patch: 16

data/bin/god

@@ -7,6 +7,7 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 require 'rubygems'
 require 'optparse'
 require 'drb'
+require 'yaml'
 
 begin
   options = {:daemonize => true, :port => 17165, :syslog => true, :events => true}

data/god.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{god}
-  s.version = "0.7.15"
+  s.version = "0.7.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2009-08-19}
+  s.date = %q{2009-08-24}
   s.default_executable = %q{god}
   s.description = %q{God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{tom@mojombo.com}

data/lib/god/conditions/disk_usage.rb

@@ -18,10 +18,15 @@ module God
       end
       
       def test
-        usage = `df | grep -i " #{self.mount_point}$" | awk '{print $5}' | sed 's/%//'`
-        usage.to_i > self.above
+        usage = `df -P | grep -i " #{self.mount_point}$" | awk '{print $5}' | sed 's/%//'`
+        if usage.to_i > self.above
+          self.info = "disk space out of bounds"
+          return true
+        else
+          self.info = "disk space ok"
+          return false
+        end
       end
     end
-    
   end
-end
+end

data/lib/god/driver.rb

@@ -90,7 +90,8 @@ module God
             Thread.stop
           else
             Thread.critical = false
-            sleep @events.first.at - Time.now
+            delay = @events.first.at - Time.now
+            sleep delay if delay > 0
             Thread.critical = true
           end
         end

data/lib/god/task.rb

@@ -479,13 +479,17 @@ module God
       # notify each contact
       resolved_contacts.each do |c|
         host = `hostname`.chomp rescue 'none'
-        c.notify(message, Time.now, spec[:priority], spec[:category], host)
-        
-        msg = "#{condition.watch.name} #{c.info ? c.info : "notification sent for contact: #{c.name}"} (#{c.base_name})"
-        
-        applog(condition.watch, :info, msg % [])
+        begin
+          c.notify(message, Time.now, spec[:priority], spec[:category], host)
+          msg = "#{condition.watch.name} #{c.info ? c.info : "notification sent for contact: #{c.name}"} (#{c.base_name})"
+          applog(condition.watch, :info, msg % [])
+        rescue Exception => e
+          applog(condition.watch, :error, "#{e.message} #{e.backtrace}")
+          msg = "#{condition.watch.name} Failed to deliver notification for contact: #{c.name} (#{c.base_name})"
+          applog(condition.watch, :error, msg % [])
+        end
       end
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: god
 version: !ruby/object:Gem::Version 
-  version: 0.7.15
+  version: 0.7.16
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-19 00:00:00 -07:00
+date: 2009-08-24 00:00:00 -07:00
 default_executable: god
 dependencies: []