External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-21 07:47:44 -02:30
Code Issues Packages Projects Releases Wiki Activity

add support for Accept:application/json to /api/v2/metrics

Browse Source 
see: https://github.com/ansible/awx/issues/4144
This commit is contained in:
Ryan Petrello
2019-08-12 15:08:15 -04:00
parent a776d0ba59
commit 82f5072c7d
5 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awxkit/awxkit/api/pages/page.py
View File

@@ -172,7 +172,7 @@ class Page(object):
resp.status_code = 200
return cls(r=resp)
def page_identity(self, response, request_json=None, ignore_json_errors=False):
def page_identity(self, response, request_json=None):
"""Takes a `requests.Response` and
returns a new __item_class__ instance if the request method is not a get, or returns
a __class__ instance if the request path is different than the caller's `endpoint`.
@@ -191,7 +191,7 @@ class Page(object):
data = response.json()
except ValueError as e: # If there was no json to parse
data = dict()
if (response.text and not ignore_json_errors) or response.status_code not in (200, 202, 204):
if response.text or response.status_code not in (200, 202, 204):
text = response.text
if len(text) > 1024:
text = text[:1024] + '... <<< Truncated >>> ...'