olgen-god 0.8.2 → 0.9.0

data/VERSION.yml

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

data/lib/god.rb

@@ -38,6 +38,7 @@ require 'god/behaviors/clean_unix_socket'
 require 'god/behaviors/notify_when_flapping'
 
 require 'god/condition'
+require 'god/conditions/condition_helper'
 require 'god/conditions/ping'
 require 'god/conditions/process_running'
 require 'god/conditions/process_exits'

data/lib/god/conditions/condition_helper.rb

@@ -0,0 +1,23 @@
+module God
+  module Conditions
+
+    module ConditionHelper
+      
+      def timeline_test(res)
+        @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}"
+          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
+        end
+      end
+
+    end
+  end
+end

data/lib/god/conditions/http_response_code.rb

@@ -63,6 +63,7 @@ module God
     #     c.timeout = 10
     #   end
     class HttpResponseCode < PollCondition
+      include ConditionHelper
       attr_accessor :code_is,      # e.g. 500 or '500' or [404, 500] or %w{404 500}
                     :code_is_not,  # e.g. 200 or '200' or [200, 302] or %w{200 302}
                     :times,        # e.g. 3 or [3, 5]
@@ -70,15 +71,18 @@ module God
                     :port,         # e.g. 8080
                     :timeout,      # e.g. 60.seconds
                     :path,         # e.g. '/'
-                    :headers       # e.g. {'Host' => 'myvirtual.mydomain.com'}
+                    :headers,      # e.g. {'Host' => 'myvirtual.mydomain.com'}
+                    :method,       # e.g. :post, :get
+                    :data     # e.g. {:ua=>"Mozilla 3.5"}
       
       def initialize
         super
         self.port = 80
         self.path = '/'
         self.headers = {}
-        self.times = [1, 1]
+        self.times = [3, 5]
         self.timeout = 60.seconds
+        self.method = :get
       end
       
       def prepare
@@ -101,19 +105,29 @@ module God
       def valid?
         valid = true
         valid &= complain("Attribute 'host' must be specified", self) if self.host.nil?
+        valid &= complain("Attribute 'method' must be in [:get, :post]", self) if ![:get, :post].include?(self.method)
         valid &= complain("One (and only one) of attributes 'code_is' and 'code_is_not' must be specified", self) if
           (self.code_is.nil? && self.code_is_not.nil?) || (self.code_is && self.code_is_not)
         valid
       end
       
+
       def test
         response = nil
-        
         Net::HTTP.start(self.host, self.port) do |http|
           http.read_timeout = self.timeout
-          response = http.get(self.path, self.headers)
+          if self.method == :get
+            response = http.get(self.path, self.headers)
+          else self.method == :post
+            req = Net::HTTP::Post.new(self.path, self.headers)
+            req.set_form_data(self.data, ';') if self.data
+            response =  http.request(req)
+          end
         end
         
+        # require 'ruby-debug'; debugger
+        
+        
         actual_response_code = response.code.to_i
         if self.code_is && self.code_is.include?(actual_response_code)
           pass(actual_response_code)
@@ -139,20 +153,13 @@ module God
       private
       
       def pass(code)
-        @timeline << true
-        if @timeline.select { |x| x }.size >= self.times.first
-          self.info = "http response abnormal #{history(code, true)}"
-          true
-        else
-          self.info = "http response nominal #{history(code, true)}"
-          false
-        end
+          self.info = "http response 1abnormal #{history(code, true)}"
+          return timeline_test(true)
       end
       
       def fail(code)
-        @timeline << false
-        self.info = "http response nominal #{history(code, false)}"
-        false
+        self.info = "http response 3nominal #{history(code, false)}"
+        return timeline_test(false)
       end
       
       def history(code, passed)
@@ -162,6 +169,21 @@ module God
         '[' + @history.join(", ") + ']'
       end
       
+      # def timeline_test(res)
+      #   @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}"
+      #     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
+      #   end
+      # end
+      
     end
     
   end

data/lib/god/conditions/lambda.rb

@@ -2,23 +2,31 @@ module God
   module Conditions
     
     class Lambda < PollCondition
-      attr_accessor :lambda
+      include ConditionHelper
+      attr_accessor :lambda, :times
 
+      def initialize
+        super
+        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?
         valid = true
         valid &= complain("Attribute 'lambda' must be specified", self) if self.lambda.nil?
         valid
       end
 
-      def test
-        if self.lambda.call()
-          self.info = "lambda condition was satisfied"
-          true
-        else
-          self.info = "lambda condition was not satisfied"
-          false
-        end
+      def test  
+        return timeline_test(self.lambda.call)
       end
+
     end
 
   end

data/olgen-god.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{olgen-god}
-  s.version = "0.8.2"
+  s.version = "0.9.0"
 
   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{2009-11-11}
+  s.date = %q{2010-02-22}
   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}
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
      "lib/god/condition.rb",
      "lib/god/conditions/always.rb",
      "lib/god/conditions/complex.rb",
+     "lib/god/conditions/condition_helper.rb",
      "lib/god/conditions/cpu_usage.rb",
      "lib/god/conditions/degrading_lambda.rb",
      "lib/god/conditions/disk_usage.rb",
@@ -170,7 +171,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/olgen/god}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib", "ext"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Like god, but olgen!}
   s.test_files = [
     "test/configs/child_events/simple_server.rb",

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: olgen-god
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Tom Preston-Werner, Eugen Martin
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 +01:00
+date: 2010-02-22 00:00:00 +01:00
 default_executable: god
 dependencies: []
 
@@ -54,6 +59,7 @@ files:
 - lib/god/condition.rb
 - lib/god/conditions/always.rb
 - lib/god/conditions/complex.rb
+- lib/god/conditions/condition_helper.rb
 - lib/god/conditions/cpu_usage.rb
 - lib/god/conditions/degrading_lambda.rb
 - lib/god/conditions/disk_usage.rb
@@ -183,18 +189,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Like god, but olgen!