mirror of
https://github.com/ihabunek/toot
synced 2025-02-03 20:57:38 +01:00
Catch request errors
This commit is contained in:
parent
f1dca18365
commit
db6d8c6d73
13
toot/http.py
13
toot/http.py
@ -1,4 +1,6 @@
|
|||||||
from requests import Request, Session
|
from requests import Request, Session
|
||||||
|
from requests.exceptions import RequestException
|
||||||
|
|
||||||
from toot import __version__
|
from toot import __version__
|
||||||
from toot.exceptions import NotFoundError, ApiError
|
from toot.exceptions import NotFoundError, ApiError
|
||||||
from toot.logging import log_request, log_response
|
from toot.logging import log_request, log_response
|
||||||
@ -11,10 +13,13 @@ def send_request(request, allow_redirects=True):
|
|||||||
|
|
||||||
log_request(request)
|
log_request(request)
|
||||||
|
|
||||||
with Session() as session:
|
try:
|
||||||
prepared = session.prepare_request(request)
|
with Session() as session:
|
||||||
settings = session.merge_environment_settings(prepared.url, {}, None, None, None)
|
prepared = session.prepare_request(request)
|
||||||
response = session.send(prepared, allow_redirects=allow_redirects, **settings)
|
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)
|
log_response(response)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user