diff --git a/FAPI/BearerManager.py b/FAPI/BearerManager.py index 3f4af36..6a2992b 100644 --- a/FAPI/BearerManager.py +++ b/FAPI/BearerManager.py @@ -34,7 +34,7 @@ class BearerManager: def _request(self, _endpoint: Endpoints) -> requests.Response: endpoint = self.base_address + _endpoint.value - return self.session.get(url=endpoint, headers={'auth': self.demb_capi_auth}) + return self.session.get(url=endpoint, headers={'auth': self.demb_capi_auth}, timeout=10) class BearerManagerException(Exception): diff --git a/FAPI/Requester.py b/FAPI/Requester.py index 13aafa9..655d757 100644 --- a/FAPI/Requester.py +++ b/FAPI/Requester.py @@ -85,12 +85,17 @@ def request(url: str, method: str = 'get', **kwargs) -> requests.Response: method=method, url=url, headers={'Authorization': f'Bearer {bearer_manager.get_random_bearer()}'}, + timeout=10, **kwargs ) logger.debug(f'Request complete, code {proxiedFapiRequest.status_code!r}, len ' f'{len(proxiedFapiRequest.content)}') + except requests.exceptions.Timeout as e: + logger.opt(exception=e).error(f'Exception during request {method} {url!r} {kwargs!r}') + continue + except requests.exceptions.ConnectionError as e: logger.error(f'Proxy {proxy.url} is invalid: {str(e.__class__.__name__)}') continue