zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-15 04:21:49 -05:00
Code Issues Packages Projects Releases Wiki Activity

move logger logic to formatter

Browse Source
This commit is contained in:
Chris Meyers
2017-02-20 14:30:17 -05:00
parent 0dada82b4b
commit 31a79c331d
2 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
awx/api/generics.py
View File

@@ -119,36 +119,7 @@ class APIView(views.APIView):
response['X-API-Query-Count'] = len(q_times)
response['X-API-Query-Time'] = '%0.3fs' % sum(q_times)
def copy_items_try_to_numberify(d, keys):
new_d = {}
for k in keys:
val = d[k]
if val.endswith('s'):
val = val[:-1]
try:
new_d[k] = int(val)
except ValueError:
try:
new_d[k] = float(val)
except ValueError:
new_d[k] = val
return new_d
log = copy_items_try_to_numberify(response, ['X-API-Time', 'X-API-Query-Count', 'X-API-Query-Time', 'X-API-Node',])
req = {
'method': request.method,
'path': request.path,
'path_info': request.path_info,
'query_string': request.META['QUERY_STRING'],
}
if request.method == "POST":
req['post_data'] = request.POST
elif request.method == "GET":
req['get_data'] = request.GET
analytics_logger.info("api response", extra=dict(request=req, x_api=log))
analytics_logger.info("api response", extra=dict(python_objects=dict(request=request, response=response)))
return response
def get_authenticate_header(self, request):