infopark_cloud_connector 6.8.2.7.128454143 → 6.8.2.36.82613853

data/lib/rails_connector/content_service.rb

@@ -12,15 +12,45 @@ class ContentService
     attr_reader :retry_after
   end
 
-  def self.query(path, payload)
-    retry_once_on_socket_error do
-      ConnectionManager.ensure_started(uri)
-      request = build_request(path, payload)
-      handle_response(ConnectionManager.connection.request(request))
+  class MaxSleepTimeReached < StandardError
+  end
+
+  class Delay
+    def initialize
+      @sleep_count = 0
+      @total_sleep_time = 0
+    end
+
+    def next_sleep_time(min_sleep = 0)
+      sleep_time = [2 ** @sleep_count * 0.5, min_sleep.to_f].max
+      @total_sleep_time += sleep_time
+      raise MaxSleepTimeReached if @total_sleep_time > 40
+      @sleep_count += 1
+      sleep_time
     end
   end
 
   class << self
+    @next_request_not_before = nil
+
+    def query(path, payload)
+      retry_once_on_socket_error do
+        retry_until_timeout_on_rate_limit_exceeded do
+          ConnectionManager.ensure_started(uri)
+          request = build_request(path, payload)
+          if @next_request_not_before && @next_request_not_before > (now = Time.now)
+            sleep @next_request_not_before - now
+          end
+          handle_response(ConnectionManager.connection.request(request))
+        end
+      end
+    end
+
+    # for tests only
+    def forget_retry_after
+      @next_request_not_before = nil
+    end
+
     private
 
     def retry_once_on_socket_error
@@ -32,8 +62,19 @@ class ContentService
         ConnectionManager.ensure_finished
         retried = true
         retry
+      end
+    end
+
+    def retry_until_timeout_on_rate_limit_exceeded
+      delay = Delay.new
+      begin
+        yield
       rescue RateLimitExceeded => e
-        sleep (e.retry_after || 0.8).to_f
+        begin
+          sleep delay.next_sleep_time(e.retry_after)
+        rescue MaxSleepTimeReached
+          raise BackendNotAvailable.new('rate limit exceeded', 429)
+        end
         retry
       end
     end
@@ -47,6 +88,8 @@ class ContentService
 
     def handle_response(response)
       if response.code.first == '2'
+        retry_after = response["Retry-After"]
+        @next_request_not_before = retry_after ? Time.now + retry_after.to_f : nil
         MultiJson.load(response.body)
       elsif response.code == "429"
         raise RateLimitExceeded.new(response["Retry-After"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: infopark_cloud_connector
 version: !ruby/object:Gem::Version
-  version: 6.8.2.7.128454143
+  version: 6.8.2.36.82613853
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.2.7.128454143
+        version: 6.8.2.36.82613853
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.8.2.7.128454143
+        version: 6.8.2.36.82613853
 description: The Cloud Connector for Infopark CMS Fiona enables you to develop modern,
   dynamic Web 2.0 applications using Ruby on Rails and at the same time display CMS
   managed content.
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 903498323
+      hash: -1009000627
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: