right_support 1.0.7 → 1.0.8

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

@@ -27,10 +27,6 @@ module RightSupport::Net::Balancing
   class EndpointsStack
     DEFAULT_YELLOW_STATES = 4
     DEFAULT_RESET_TIME    = 300
-
-    def endpoints
-      @endpoints
-    end
     
     def initialize(endpoints, yellow_states=nil, reset_time=nil)
       @endpoints = Hash.new
@@ -95,16 +91,14 @@ module RightSupport::Net::Balancing
   class HealthCheck
     
     def initialize(endpoints,options = {})
-      # Modified by Ryan Williamson on 9/27/2011
-      # Previously if you created an instance of HealthCheck without the required options
-      # they would get passed as nil and overwrite EndpointsStack's default options causing an ArgumentError
       yellow_states = options[:yellow_states]
       reset_time = options[:reset_time]
-      # End modification
+
       @health_check = options.delete(:health_check)
 
       @stack = EndpointsStack.new(endpoints,yellow_states,reset_time)
-      @counter = rand(0xffff)
+      @counter = rand(0xffff) % endpoints.size
+      @last_size = endpoints.size
     end
 
     def next
@@ -114,8 +108,10 @@ module RightSupport::Net::Balancing
       return nil if endpoints.empty?
       
       # Selection of the next endpoint using RoundRobin
-      @counter += 1
-      i = @counter % endpoints.size      
+      @counter += 1 unless endpoints.size < @last_size
+      @counter = 0 if @counter == endpoints.size
+      i = @counter % endpoints.size
+      @last_size = endpoints.size
       
       # Returns false or true, depending on whether EP is yellow or not
       [ endpoints[i][0], endpoints[i][1][:n_level] != 0 ]

data/lib/right_support/net/request_balancer.rb

@@ -112,7 +112,7 @@ module RightSupport::Net
         raise ArgumentError, ":health_check callback must accept one parameters"
       end
 
-      @endpoints = endpoints.shuffle
+      @endpoints = endpoints
     end
 
     # Perform a request.

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.7'
-  s.date    = '2011-10-13'
+  s.version = '1.0.8'
+  s.date    = '2011-10-14'
 
   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: 25
+  hash: 7
   prerelease: false
   segments: 
   - 1
   - 0
-  - 7
-  version: 1.0.7
+  - 8
+  version: 1.0.8
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 -07:00
+date: 2011-10-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency