esi 0.2.23 → 0.2.24
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/esi/client.rb +10 -8
- data/lib/esi/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a7b6098c5606f22d9b701db434e9d166a5942765
|
4
|
+
data.tar.gz: 7ceb5a2959311258b6f3ec4059866491ee53c7cc
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: cb00a3fc23f418f979c42a5529f647fae8b25438cf3727b6ab33d90428e844f83ca407df2bc7729510bb06adf6c873baf3ddc6f225f19d194ef8991b71f488d3
|
7
|
+
data.tar.gz: e903150bf5c6bc66a071f34cc440439bf3479d08e2afadccfb92ef7728f3e15f3811c19be964cc8e08ba211dbbbe1eb82fa30ecdb4363446d83921222dccaf6d
|
data/lib/esi/client.rb
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
module Esi
|
2
2
|
class Client
|
3
|
-
MAX_ATTEMPTS =
|
3
|
+
MAX_ATTEMPTS = 2
|
4
4
|
|
5
5
|
attr_accessor :refresh_callback, :access_token, :refresh_token, :expires_at
|
6
6
|
attr_reader :logger, :oauth
|
@@ -76,6 +76,7 @@ module Esi
|
|
76
76
|
response
|
77
77
|
end
|
78
78
|
|
79
|
+
# FIXME: esi should not retry
|
79
80
|
def request(call, &block)
|
80
81
|
response = nil
|
81
82
|
last_ex = nil
|
@@ -99,24 +100,25 @@ module Esi
|
|
99
100
|
next
|
100
101
|
rescue OAuth2::Error => e
|
101
102
|
last_ex = e
|
103
|
+
response = Response.new(e.response, call)
|
102
104
|
|
103
105
|
case e.response.status
|
104
106
|
when 502 # Temporary server error
|
105
|
-
logger.error "TemporaryServerError
|
106
|
-
sleep
|
107
|
+
logger.error "TemporaryServerError: #{response.error}"
|
108
|
+
sleep 5
|
107
109
|
next
|
108
110
|
when 503 # Rate Limit
|
109
|
-
logger.error "RateLimit error, sleeping for
|
110
|
-
sleep
|
111
|
+
logger.error "RateLimit error, sleeping for 5 seconds"
|
112
|
+
sleep 5
|
111
113
|
next
|
112
114
|
when 404 # Not Found
|
113
115
|
raise Esi::ApiNotFoundError.new(Response.new(e.response, call))
|
114
116
|
when 403 # Forbidden
|
115
|
-
response = Response.new(e.response, call)
|
117
|
+
# response = Response.new(e.response, call)
|
116
118
|
debug_error('ApiForbiddenError', url, e.response)
|
117
119
|
raise Esi::ApiForbiddenError.new(response)
|
118
120
|
when 400 # Bad Request
|
119
|
-
response = Response.new(e.response, call)
|
121
|
+
# response = Response.new(e.response, call)
|
120
122
|
case response.error
|
121
123
|
when 'invalid_token'
|
122
124
|
debug_error('ApiRefreshTokenExpiredError ', url, response)
|
@@ -129,7 +131,7 @@ module Esi
|
|
129
131
|
raise Esi::ApiBadRequestError.new(response)
|
130
132
|
end
|
131
133
|
else
|
132
|
-
response = Response.new(e.response, call)
|
134
|
+
# response = Response.new(e.response, call)
|
133
135
|
debug_error('ApiUnknownError', url, response)
|
134
136
|
raise Esi::ApiUnknownError.new(response)
|
135
137
|
end
|
data/lib/esi/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: esi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.24
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Danny Hiemstra
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-01-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: oauth2
|
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
147
147
|
version: '0'
|
148
148
|
requirements: []
|
149
149
|
rubyforge_project:
|
150
|
-
rubygems_version: 2.6.
|
150
|
+
rubygems_version: 2.6.13
|
151
151
|
signing_key:
|
152
152
|
specification_version: 4
|
153
153
|
summary: EVE ESI API wrapper
|