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

Add option to return response from http_handler

Browse source
This commit is contained in:
JonnyWong16 2021-02-27 13:10:11 -08:00
commit 775616b52d
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plexpy/http_handler.py
View file

@ -77,6 +77,7 @@ class HTTPHandler(object):
self.data = None self.data = None
self.request_type = 'GET' self.request_type = 'GET'
self.output_format = 'raw' self.output_format = 'raw'
self.return_response = False
self.return_type = False self.return_type = False
self.callback = None self.callback = None
self.request_kwargs = {} self.request_kwargs = {}
@ -87,6 +88,7 @@ class HTTPHandler(object):
data=None, data=None,
request_type='GET', request_type='GET',
output_format='raw', output_format='raw',
return_response=False,
return_type=False, return_type=False,
no_token=False, no_token=False,
timeout=None, timeout=None,
@ -102,6 +104,7 @@ class HTTPHandler(object):
self.data = data self.data = data
self.request_type = request_type.upper() self.request_type = request_type.upper()
self.output_format = output_format.lower() self.output_format = output_format.lower()
self.return_response = return_response
self.return_type = return_type self.return_type = return_type
self.callback = callback self.callback = callback
self.timeout = timeout or self.timeout self.timeout = timeout or self.timeout
@ -156,6 +159,7 @@ 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
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,
@ -164,22 +168,22 @@ class HTTPHandler(object):
except requests.exceptions.Timeout as e: except requests.exceptions.Timeout as e:
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)
return None
except requests.exceptions.SSLError as e: except requests.exceptions.SSLError as e:
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)
return None
except requests.exceptions.HTTPError as e: except requests.exceptions.HTTPError as e:
if not self._silent: if not self._silent:
logger.error(error_msg + "Status code %s", e) logger.error(error_msg + "Status code %s", e)
return None
except requests.exceptions.ConnectionError as e: except requests.exceptions.ConnectionError as e:
if not self._silent: if not self._silent:
logger.error(error_msg + "Connection error: %s", e) logger.error(error_msg + "Connection error: %s", e)
return None
except requests.exceptions.RequestException as e: except requests.exceptions.RequestException as e:
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:
return r
elif e:
return None return None
response_status = r.status_code response_status = r.status_code