matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Retry send_file on 502.

Browse Source 
Rename _rate_limit_helper to _retry_helper
This commit is contained in:
Khazhismel Kumykov 2016-05-16 02:19:08 -04:00 committed by Rapptz
parent a1b5cefc8b
commit 7bdddc37a0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
discord/client.py
View File

@ -760,9 +760,11 @@ class Client:
return channel return channel
@asyncio.coroutine @asyncio.coroutine
def _rate_limit_helper(self, name, method, url, data, retries=0): def _retry_helper(self, name, *args, retries=0, **kwargs):
resp = yield from self.session.request(method, url, data=data, headers=self.headers) req_kwargs = {'headers': self.headers}
tmp = request_logging_format.format(method=method, response=resp) req_kwargs.update(kwargs)
resp = yield from self.session.request(*args, **req_kwargs)
tmp = request_logging_format.format(method=resp.method, response=resp)
log_fmt = 'In {}, {}'.format(name, tmp) log_fmt = 'In {}, {}'.format(name, tmp)
log.debug(log_fmt) log.debug(log_fmt)
@ -770,13 +772,13 @@ class Client:
# retry the 502 request unconditionally # retry the 502 request unconditionally
log.info('Retrying the 502 request to ' + name) log.info('Retrying the 502 request to ' + name)
yield from asyncio.sleep(retries + 1) yield from asyncio.sleep(retries + 1)
return (yield from self._rate_limit_helper(name, method, url, data, retries + 1)) return (yield from self._retry_helper(name, *args, retries=retries + 1, **kwargs))
if resp.status == 429: if resp.status == 429:
retry = float(resp.headers['Retry-After']) / 1000.0 retry = float(resp.headers['Retry-After']) / 1000.0
yield from resp.release() yield from resp.release()
yield from asyncio.sleep(retry) yield from asyncio.sleep(retry)
return (yield from self._rate_limit_helper(name, method, url, data, retries)) return (yield from self._retry_helper(name, *args, retries=retries, **kwargs))
return resp return resp
@ -840,7 +842,7 @@ class Client:
if tts: if tts:
payload['tts'] = True payload['tts'] = True
resp = yield from self._rate_limit_helper('send_message', 'POST', url, utils.to_json(payload)) resp = yield from self._retry_helper('send_message', 'POST', url, data=utils.to_json(payload))
yield from utils._verify_successful_response(resp) yield from utils._verify_successful_response(resp)
data = yield from resp.json(encoding='utf-8') data = yield from resp.json(encoding='utf-8')
log.debug(request_success_log.format(response=resp, json=payload, data=data)) log.debug(request_success_log.format(response=resp, json=payload, data=data))
@ -938,10 +940,10 @@ class Client:
# attempt to open the file and send the request # attempt to open the file and send the request
with open(fp, 'rb') as f: with open(fp, 'rb') as f:
form.add_field('file', f, filename=filename, content_type='application/octet-stream') form.add_field('file', f, filename=filename, content_type='application/octet-stream')
response = yield from self.session.post(url, data=form, headers=headers) response = yield from self._retry_helper("send_file", "POST", url, data=form, headers=headers)
except TypeError: except TypeError:
form.add_field('file', fp, filename=filename, content_type='application/octet-stream') form.add_field('file', fp, filename=filename, content_type='application/octet-stream')
response = yield from self.session.post(url, data=form, headers=headers) response = yield from self._retry_helper("send_file", "POST", url, data=form, headers=headers)
log.debug(request_logging_format.format(method='POST', response=response)) log.debug(request_logging_format.format(method='POST', response=response))
yield from utils._verify_successful_response(response) yield from utils._verify_successful_response(response)
@ -1146,7 +1148,7 @@ class Client:
'content': content 'content': content
} }
response = yield from self._rate_limit_helper('edit_message', 'PATCH', url, utils.to_json(payload)) response = yield from self._retry_helper('edit_message', 'PATCH', url, data=utils.to_json(payload))
log.debug(request_logging_format.format(method='PATCH', response=response)) log.debug(request_logging_format.format(method='PATCH', response=response))
yield from utils._verify_successful_response(response) yield from utils._verify_successful_response(response)
data = yield from response.json(encoding='utf-8') data = yield from response.json(encoding='utf-8')