right_support 2.6.11 → 2.6.12

data/lib/right_support/net/request_balancer.rb

@@ -111,17 +111,6 @@ module RightSupport::Net
       new(endpoints, options).request(&block)
     end
 
-    def resolve(endpoints)
-      resolved_endpoints = RightSupport::Net::DNS.resolve(endpoints)
-      @resolved_at = Time.now.to_i
-      logger.info("RequestBalancer: resolved #{endpoints.inspect} to #{resolved_endpoints.inspect}")
-      resolved_endpoints
-    end
-
-    def need_resolve?
-      @options[:resolve] && Time.now.to_i - @resolved_at > @options[:resolve]
-    end
-
     # Constructor. Accepts a sequence of request endpoints which it shuffles randomly at
     # creation time; however, the ordering of the endpoints does not change thereafter
     # and the sequence is tried from the beginning for every request.
@@ -185,8 +174,10 @@ module RightSupport::Net
       @endpoints = endpoints
 
       if @options[:resolve]
-        @resolved_at = 0
+        # Perform initial DNS resolution
+        resolve
       else
+        # Use endpoints as-is
         @policy.set_endpoints(@endpoints)
       end
     end
@@ -207,10 +198,7 @@ module RightSupport::Net
     def request
       raise ArgumentError, "Must call this method with a block" unless block_given?
 
-      if need_resolve?
-        @ips = self.resolve(@endpoints)
-        @policy.set_endpoints(@ips)
-      end
+      resolve if need_resolve?
 
       exceptions = {}
       result     = nil
@@ -332,6 +320,18 @@ module RightSupport::Net
       end
     end
 
+    def resolve
+      resolved_endpoints = RightSupport::Net::DNS.resolve(@endpoints)
+      logger.info("RequestBalancer: resolved #{@endpoints.inspect} to #{resolved_endpoints.inspect}")
+      @ips = resolved_endpoints
+      @policy.set_endpoints(@ips)
+      @resolved_at = Time.now.to_i
+    end
+
+    def need_resolve?
+      @options[:resolve] && Time.now.to_i - @resolved_at > @options[:resolve]
+    end
+
     def test_policy_duck_type(object)
       [:next, :good, :bad].all? { |m| object.respond_to?(m) }
     end

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 = '2.6.11'
-  s.date    = '2013-01-02'
+  s.version = '2.6.12'
+  s.date    = '2013-01-03'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin', 'Alexey Karpik', 'Scott Messier']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 6
-  - 11
-  version: 2.6.11
+  - 12
+  version: 2.6.12
 platform: ruby
 authors: 
 - Tony Spataro
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-02 00:00:00 -08:00
+date: 2013-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []