olgen-god 0.9.0 → 0.9.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 9

data/lib/god/conditions/condition_helper.rb

@@ -3,21 +3,27 @@ module God
 
     module ConditionHelper
       
+      # check the result in the timeline..
       def timeline_test(res)
+        self.trigger_on = true if self.trigger_on.nil?
         @timeline << res
-        history = " - SUCCESS RATE: [#{@timeline.select { |x| x }.size}/#{@timeline.length}]"
-        if @timeline.select { |x| x }.size >= self.times[0]
-          self.info = " PASSED #{history}"
+        history = " - TRIGGER RATE: [#{@timeline.select { |x| x==self.trigger_on }.size}/#{@timeline.length}]"
+        if @timeline.select { |x| x == self.trigger_on }.size >= self.times[0]
+          status = trigger_on ? "UP" : "DOWN"
+          self.info = " SERVICE STATUS moved to: #{status}"
           return true
-        elsif @timeline.select { |x| !x }.size > self.times[1] - self.times[0]
-          self.info = " FAILED #{history}"
-          return false
         else
-          self.info = "history too short: #{history}"
-          return nil # do not trigger a transition
+          self.info = " PASSED #{history}"
+          return false
         end
       end
 
+
+      # # invert the result if needed...
+      # def trigger_check(res)
+      #   trigger_on ? res : !res
+      # end
+
     end
   end
 end

data/lib/god/conditions/http_response_code.rb

@@ -73,7 +73,8 @@ module God
                     :path,         # e.g. '/'
                     :headers,      # e.g. {'Host' => 'myvirtual.mydomain.com'}
                     :method,       # e.g. :post, :get
-                    :data     # e.g. {:ua=>"Mozilla 3.5"}
+                    :data,     # e.g. {:ua=>"Mozilla 3.5"}
+                    :trigger_on   # can trigger both on: true or false
       
       def initialize
         super

data/lib/god/conditions/lambda.rb

@@ -3,13 +3,14 @@ module God
     
     class Lambda < PollCondition
       include ConditionHelper
-      attr_accessor :lambda, :times
+      attr_accessor :lambda, :times,:trigger_on   # can trigger both on: true or false
 
       def initialize
         super
+        self.trigger_on = true
         self.times = [1, 1]
       end
-      
+        
       def prepare
         if self.times.kind_of?(Integer)
           self.times = [self.times, self.times]
@@ -17,6 +18,10 @@ module God
         @timeline = Timeline.new(self.times[1])
       end
       
+      def reset
+        @timeline.clear
+      end
+      
       def valid?
         valid = true
         valid &= complain("Attribute 'lambda' must be specified", self) if self.lambda.nil?
@@ -26,7 +31,6 @@ module God
       def test  
         return timeline_test(self.lambda.call)
       end
-
     end
 
   end

data/lib/god/conditions/ping.rb

@@ -2,13 +2,22 @@ module God
   module Conditions
     
     class Ping < PollCondition
-      attr_accessor :timeout, :host, :trigger_on
+      include ConditionHelper
+      attr_accessor :timeout, :host, :trigger_on, :times
       
       def initialize
         super
         self.timeout = 2 # s
         self.host = nil
         self.trigger_on=true
+        self.times = [1, 1]
+      end
+
+      def prepare
+        if self.times.kind_of?(Integer)
+          self.times = [self.times, self.times]
+        end
+        @timeline = Timeline.new(self.times[1])
       end
       
       def valid?
@@ -23,10 +32,10 @@ module God
         ping_result = `#{cmd}`
         if ping_result=~/time=/
           self.info = "Server reachable via ping!"
-          return self.trigger_on
+          return timeline_test(self.trigger_on)
         end
         self.info = "Server unreachable via ping!!!"
-        return !self.trigger_on
+        return timeline_test(!self.trigger_on)
       end
     end
   end

data/olgen-god.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{olgen-god}
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner, Eugen Martin"]
-  s.date = %q{2010-02-22}
+  s.date = %q{2010-03-04}
   s.default_executable = %q{god}
   s.description = %q{Fork of God - God is an easy to configure, easy to extend monitoring framework written in Ruby.}
   s.email = %q{eugen.martin@madvertise.de}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Tom Preston-Werner, Eugen Martin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-22 00:00:00 +01:00
+date: 2010-03-04 00:00:00 +01:00
 default_executable: god
 dependencies: []