Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle bad http requests in api clients 

Previously unhandled, the http requests should either fail hard, or
errors should be logged with details of the failed request.
This commit is contained in:
jo 2021-08-01 14:14:36 +02:00
parent d58fe19ae3
commit a6e9f3109c
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python_apps/api_clients/api_clients/utils.py
View File

@ -96,25 +96,35 @@ class ApiRequest:
self.logger.debug(final_url) self.logger.debug(final_url)
try: try:
if _post_data: if _post_data:
response = requests.post( res = requests.post(
final_url, final_url,
data=_post_data, data=_post_data,
auth=self.auth, auth=self.auth,
timeout=ApiRequest.API_HTTP_REQUEST_TIMEOUT, timeout=ApiRequest.API_HTTP_REQUEST_TIMEOUT,
) )
else: else:
response = requests.get( res = requests.get(
final_url, final_url,
params=params, params=params,
auth=self.auth, auth=self.auth,
timeout=ApiRequest.API_HTTP_REQUEST_TIMEOUT, timeout=ApiRequest.API_HTTP_REQUEST_TIMEOUT,
) )
if "application/json" in response.headers["content-type"]:
return response.json() # Check for bad HTTP status code
return response res.raise_for_status()
if "application/json" in res.headers["content-type"]:
return res.json()
return res
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
self.logger.error("HTTP request to %s timed out", final_url) self.logger.error("HTTP request to %s timed out", final_url)
raise raise
except requests.exceptions.HTTPError:
self.logger.error(
f"HTTP request to '{res.request.url}' failed"
f" with status '{res.status_code}':\n{res.text}"
)
raise
def req(self, *args, **kwargs): def req(self, *args, **kwargs):
self.__req = lambda: self(*args, **kwargs) self.__req = lambda: self(*args, **kwargs)