right_support 1.0.6 → 1.0.7

data/lib/right_support/net/balancing/health_check.rb

@@ -25,12 +25,13 @@ require 'set'
 module RightSupport::Net::Balancing
   
   class EndpointsStack
-
-    # Modified by Ryan Williamson on 9/28/2011 to ensure default values exist
-    # for @yellow_states and @reset_time
     DEFAULT_YELLOW_STATES = 4
     DEFAULT_RESET_TIME    = 300
 
+    def endpoints
+      @endpoints
+    end
+    
     def initialize(endpoints, yellow_states=nil, reset_time=nil)
       @endpoints = Hash.new
       @yellow_states = yellow_states || DEFAULT_YELLOW_STATES
@@ -60,6 +61,18 @@ module RightSupport::Net::Balancing
         @endpoints[endpoint][:timestamp]  = t1
       end
     end
+
+    # Returns a hash of endpoints and their colored health status
+    # Useful for logging and debugging
+    def get_stats
+      stats = {}
+      @endpoints.each do |k, v|
+        stats[k] = 'green' if v[:n_level] == 0
+        stats[k] = 'red' if v[:n_level] == @yellow_states
+        stats[k] = "yellow-#{v[:n_level]}" if v[:n_level] > 0 && v[:n_level] < @yellow_states
+      end
+      stats
+    end
     
   end
   
@@ -119,6 +132,11 @@ module RightSupport::Net::Balancing
     def health_check(endpoint)
       @stack.increase_state(endpoint,t0,Time.now) unless @health_check.call(endpoint)      
     end
+
+    # Proxy to EndpointStack
+    def get_stats
+      @stack.get_stats
+    end
     
   end
 end

data/lib/right_support/net/request_balancer.rb

@@ -191,6 +191,29 @@ module RightSupport::Net
       raise NoResult, msg
     end
 
+    # Provide an interface so one can query the RequestBalancer for statistics on
+    # it's endpoints.  Merely proxies the balancing policy's get_stats method. If
+    # no method exists in the balancing policy, a hash of endpoints with "n/a" is
+    # returned.
+    # 
+    # Examples
+    #
+    # A RequestBalancer created with endpoints [1,2,3,4,5] and using a HealthCheck
+    # balancing policy may return:
+    #
+    # {5 => "yellow-3", 1 => "red", 2 => "yellow-1", 3 => "green", 4 => "yellow-2"}
+    #
+    # A RequestBalancer created with endpoints [1,2,3,4,5] and specifying no
+    # balancing policy or using the default RoundRobin balancing policy may return:
+    #
+    # {2 => "n/a", 1 => "n/a", 3 => "n/a"}
+    def get_stats
+      stats = {}
+      @endpoints.each { |endpoint| stats[endpoint] = 'n/a' }
+      stats = @policy.get_stats if @policy.respond_to?(:get_stats)
+      stats
+    end
+
     protected
 
     # Decide what to do with an exception. The decision is influenced by the :fatal

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '1.0.6'
-  s.date    = '2011-10-12'
+  s.version = '1.0.7'
+  s.date    = '2011-10-13'
 
   s.authors = ['Tony Spataro']
   s.email   = 'tony@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 0
-  - 6
-  version: 1.0.6
+  - 7
+  version: 1.0.7
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-12 00:00:00 -07:00
+date: 2011-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency