right_support 1.3.1 → 1.3.2

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

@@ -51,7 +51,7 @@ module RightSupport::Net::Balancing
     end
 
     def next
-      [ @endpoints[@counter % @endpoints.size], true ] unless @endpoints.empty?
+      [ @endpoints[@counter % @endpoints.size], false ] unless @endpoints.empty?
     end
 
     def good(endpoint, t0, t1)

data/lib/right_support/net/request_balancer.rb

@@ -160,8 +160,10 @@ module RightSupport::Net
     # Return the first non-nil value provided by the block.
     def request
       raise ArgumentError, "Must call this method with a block" unless block_given?
-
-      @policy.set_endpoints(self.resolve(@endpoints)) if self.expired?
+      if self.expired?
+        @ips = self.resolve(@endpoints)
+        @policy.set_endpoints(@ips)
+      end
 
       exceptions = []
       result     = nil
@@ -173,7 +175,7 @@ module RightSupport::Net
           break
         else
           do_retry = @options[:retry] || DEFAULT_RETRY_PROC
-          do_retry = do_retry.call(@endpoints, n) if do_retry.respond_to?(:call)
+          do_retry = do_retry.call(@ips || @endpoints, n) if do_retry.respond_to?(:call)
           break if (do_retry.is_a?(Integer) && n >= do_retry) || [nil, false].include?(do_retry)
         end
 
@@ -217,7 +219,7 @@ module RightSupport::Net
       return result if complete
 
       exceptions = exceptions.map { |e| e.class.name }.uniq.join(', ')
-      msg = "No available endpoints from #{@endpoints.inspect}! Exceptions: #{exceptions}"
+      msg = "No available endpoints from #{(@ips || @endpoints).inspect}! Exceptions: #{exceptions}"
       logger.error "RequestBalancer: #{msg}"
       raise NoResult, msg
     end

data/lib/right_support/net/ssl.rb

@@ -15,17 +15,17 @@ module RightSupport::Net
     module_function
 
     def expected_hostname
-      @expected_hostname
+      Thread.current[:right_support_net_ssl_expected_hostname]
     end
 
     def with_expected_hostname(hostname, &block)
-      @expected_hostname = hostname
+      Thread.current[:right_support_net_ssl_expected_hostname] = hostname
       block.call
     rescue Exception => e
-      @expected_hostname = nil
+      Thread.current[:right_support_net_ssl_expected_hostname] = nil
       raise e
     ensure
-      @expected_hostname = nil
+      Thread.current[:right_support_net_ssl_expected_hostname] = nil
     end
   end
 end

data/right_support.gemspec

@@ -7,7 +7,7 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '1.3.1'
+  s.version = '1.3.2'
   s.date    = '2012-03-14'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Tony Spataro