xarvos/witchie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Catch request errors

Browse source
This commit is contained in:
Ivan Habunek 2022-11-22 21:19:52 +01:00
parent f1dca18365
commit db6d8c6d73
No known key found for this signature in database
GPG key ID: CDBD63C43A30BB95
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
toot/http.py
View file

@ -1,4 +1,6 @@
from requests import Request, Session
from requests.exceptions import RequestException
from toot import __version__
from toot.exceptions import NotFoundError, ApiError
from toot.logging import log_request, log_response
@ -11,10 +13,13 @@ def send_request(request, allow_redirects=True):
log_request(request)
with Session() as session:
prepared = session.prepare_request(request)
settings = session.merge_environment_settings(prepared.url, {}, None, None, None)
response = session.send(prepared, allow_redirects=allow_redirects, **settings)
try:
with Session() as session:
prepared = session.prepare_request(request)
settings = session.merge_environment_settings(prepared.url, {}, None, None, None)
response = session.send(prepared, allow_redirects=allow_redirects, **settings)
except RequestException as ex:
raise ApiError(f"Request failed: {str(ex)}")
log_response(response)