esi 0.2.23 → 0.2.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cab81b2c5e3392b1c3720a8470aeaa98b743ae3
-  data.tar.gz: c3fc5c92e10cae48bab8aeebe8c13b32f31d469d
+  metadata.gz: a7b6098c5606f22d9b701db434e9d166a5942765
+  data.tar.gz: 7ceb5a2959311258b6f3ec4059866491ee53c7cc
 SHA512:
-  metadata.gz: 9f0030bccb7c7d51bbf2f89e8cbd49bf44dd1e4c26c88fb8741e42b5aee4d1c5c4b0cccd08b83a6991c1b33418e4a53d410dc2734731b7a6ed9c6cb2d9f83f48
-  data.tar.gz: c25bf78bbdf3d7d4d107ae5e3bbdb20dd05580560533813b4fbafbb1b5f1002a95abe8619844290053aabc01cd1fe56f5bfff2b6e4e2284cbd368d38396a8ddc
+  metadata.gz: cb00a3fc23f418f979c42a5529f647fae8b25438cf3727b6ab33d90428e844f83ca407df2bc7729510bb06adf6c873baf3ddc6f225f19d194ef8991b71f488d3
+  data.tar.gz: e903150bf5c6bc66a071f34cc440439bf3479d08e2afadccfb92ef7728f3e15f3811c19be964cc8e08ba211dbbbe1eb82fa30ecdb4363446d83921222dccaf6d

data/lib/esi/client.rb

@@ -1,6 +1,6 @@
 module Esi
   class Client
-    MAX_ATTEMPTS = 3
+    MAX_ATTEMPTS = 2
 
     attr_accessor :refresh_callback, :access_token, :refresh_token, :expires_at
     attr_reader :logger, :oauth
@@ -76,6 +76,7 @@ module Esi
       response
     end
 
+    # FIXME: esi should not retry
     def request(call, &block)
       response = nil
       last_ex = nil
@@ -99,24 +100,25 @@ module Esi
             next
           rescue OAuth2::Error => e
             last_ex = e
+            response = Response.new(e.response, call)
 
             case e.response.status
             when 502 # Temporary server error
-              logger.error "TemporaryServerError, sleeping for 15 seconds"
-              sleep 15
+              logger.error "TemporaryServerError: #{response.error}"
+              sleep 5
               next
             when 503 # Rate Limit
-              logger.error "RateLimit error, sleeping for 15 seconds"
-              sleep 15
+              logger.error "RateLimit error, sleeping for 5 seconds"
+              sleep 5
               next
             when 404 # Not Found
               raise Esi::ApiNotFoundError.new(Response.new(e.response, call))
             when 403 # Forbidden
-              response = Response.new(e.response, call)
+              # response = Response.new(e.response, call)
               debug_error('ApiForbiddenError', url, e.response)
               raise Esi::ApiForbiddenError.new(response)
             when 400 # Bad Request
-              response = Response.new(e.response, call)
+              # response = Response.new(e.response, call)
               case response.error
               when 'invalid_token'
                 debug_error('ApiRefreshTokenExpiredError ', url, response)
@@ -129,7 +131,7 @@ module Esi
                 raise Esi::ApiBadRequestError.new(response)
               end
             else
-              response = Response.new(e.response, call)
+              # response = Response.new(e.response, call)
               debug_error('ApiUnknownError', url, response)
               raise Esi::ApiUnknownError.new(response)
             end

data/lib/esi/version.rb

@@ -1,3 +1,3 @@
 module Esi
-  VERSION = "0.2.23"
+  VERSION = "0.2.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esi
 version: !ruby/object:Gem::Version
-  version: 0.2.23
+  version: 0.2.24
 platform: ruby
 authors:
 - Danny Hiemstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-09 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: EVE ESI API wrapper