github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-19 12:59:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix exception handling in http_handler

Browse source
This commit is contained in:
JonnyWong16 2021-03-05 19:41:59 -08:00
commit 02986e946f
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plexpy/http_handler.py
View file

@ -159,31 +159,36 @@ class HTTPHandler(object):
def _http_requests_single(self, url): def _http_requests_single(self, url):
"""Request the data from the url""" """Request the data from the url"""
e = None err = False
error_msg = "Failed to access uri endpoint %s. " % self.uri error_msg = "Failed to access uri endpoint %s. " % self.uri
try: try:
r = self._session.request(self.request_type, url, headers=self.headers, data=self.data, r = self._session.request(self.request_type, url, headers=self.headers, data=self.data,
timeout=self.timeout, verify=self.ssl_verify, **self.request_kwargs) timeout=self.timeout, verify=self.ssl_verify, **self.request_kwargs)
r.raise_for_status() r.raise_for_status()
except requests.exceptions.Timeout as e: except requests.exceptions.Timeout as e:
err = True
if not self._silent: if not self._silent:
logger.error(error_msg + "Request timed out: %s", e) logger.error(error_msg + "Request timed out: %s", e)
except requests.exceptions.SSLError as e: except requests.exceptions.SSLError as e:
err = True
if not self._silent: if not self._silent:
logger.error(error_msg + "Is your server maybe accepting SSL connections only? %s", e) logger.error(error_msg + "Is your server maybe accepting SSL connections only? %s", e)
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e:
err = True
if not self._silent: if not self._silent:
logger.error(error_msg + "Status code %s", e) logger.error(error_msg + "Status code %s", e)
except requests.exceptions.ConnectionError as e: except requests.exceptions.ConnectionError as e:
err = True
if not self._silent: if not self._silent:
logger.error(error_msg + "Connection error: %s", e) logger.error(error_msg + "Connection error: %s", e)
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
err = True
if not self._silent: if not self._silent:
logger.error(error_msg + "Uncaught exception: %s", e) logger.error(error_msg + "Uncaught exception: %s", e)
if self.return_response: if self.return_response:
return r return r
elif e: elif err:
return None return None
response_status = r.status_code response_status = r.status_code