i18n-backend-http 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37d177679baecfda6a22c088c1266c42e088d8ef
-  data.tar.gz: 44e1ab757b356505eae4d352f809f68a70a0adea
+  metadata.gz: 8560707e20d17044c7ab9dd52186e50660962e2e
+  data.tar.gz: 262db68db3e531ff89c696c1c16a7f274256a8bb
 SHA512:
-  metadata.gz: 1b189828919827be728fa4ffc4d6b899627ea88ab95f370ec66cca81af78e44c026b8d7fc89e5d1288e6c96470c4ef37f1e8bec441872b3d118cb4e3c7549d6f
-  data.tar.gz: e0a5cf51511a331b2146ca600fa4182b5afef6e0c886ee750f22cac2eab331aeb612f1b7b1181181298bc10793578418fe63a0b58919f2a289f10937580b7c2e
+  metadata.gz: 6e97e8e5040e1c158c3f22c4215d9869a4400a85f087c124563a9dfcb2adbfbad1fc944e7bb8f0482d053d78699fd5d96dc71dd4a8bb0d35b4cbbc98e5385543
+  data.tar.gz: 4369413f30ad285cd37f42f0068ce9ace672f7efa912c01067a41d17283b56379c2d79896f5ca3a3f8af964ce551dd9fc45643eca63115e090e3a61767b90b7e

data/lib/i18n/backend/http.rb

@@ -11,11 +11,15 @@ module I18n
     class Http
       include ::I18n::Backend::Base
       FAILED_GET = {}.freeze
+      STATS_NAMESPACE = 'i18n-backend-http'.freeze
+      ALLOWED_STATS = Set[:download_fail, :open_retry, :read_retry].freeze
 
       def initialize(options)
         @options = {
           http_open_timeout: 1,
           http_read_timeout: 1,
+          http_open_retries: 0,
+          http_read_retries: 0,
           polling_interval: 10*60,
           cache: nil,
           poll: true,
@@ -104,9 +108,14 @@ module I18n
       end
 
       def download_translations(locale, etag:)
-        result, etag = @http_client.download(path(locale), etag: etag)
-        [parse_response(result), etag] if result
+        download_path = path(locale)
+
+        with_retry do
+          result, new_etag = @http_client.download(download_path, etag: etag)
+          [parse_response(result), new_etag] if result
+        end
       rescue => e
+        record(:download_fail, tags: ["exception:#{e.class}", "path:#{download_path}"])
         @options.fetch(:exception_handler).call(e)
         [self.class::FAILED_GET, nil]
       end
@@ -123,6 +132,28 @@ module I18n
       def lookup_key(translations, key)
         translations[key]
       end
+
+      def with_retry
+        open_tries ||= 0
+        read_tries ||= 0
+        yield
+      rescue Faraday::ConnectionFailed => e
+        raise unless e.instance_variable_get(:@wrapped_exception).is_a?(Net::OpenTimeout)
+        raise if (open_tries += 1) > @options[:http_open_retries]
+        record :open_retry
+        retry
+      rescue Faraday::TimeoutError => e
+        raise unless e.instance_variable_get(:@wrapped_exception).is_a?(Net::ReadTimeout)
+        raise if (read_tries += 1) > @options[:http_read_retries]
+        record :read_retry
+        retry
+      end
+
+      def record(event, options = {})
+        return unless statsd = @options[:statsd_client]
+        raise "Unknown statsd event type to record" unless ALLOWED_STATS.include?(event)
+        statsd.increment("#{STATS_NAMESPACE}.#{event}", tags: options[:tags])
+      end
     end
   end
 end

data/lib/i18n/backend/http/etag_http_client.rb

@@ -3,7 +3,7 @@ require 'faraday'
 module I18n
   module Backend
     class Http
-      class I18n::Backend::Http::EtagHttpClient
+      class EtagHttpClient
         STATS_NAMESPACE = 'i18n-backend-http.etag_client'.freeze
 
         def initialize(options)

data/lib/i18n/backend/http/version.rb

@@ -1,7 +1,7 @@
 module I18n
   module Backend
     class Http
-      VERSION = Version = "0.3.3"
+      VERSION = Version = "0.3.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i18n-backend-http
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: michael@grosser.it
 executables: []