openstack
/
horizon
Code Issues Proposed changes

Merge "Revert "Fix osprofiler support in horizon""

This commit is contained in:
Zuul 2019-01-31 11:46:58 +00:00 committed by Gerrit Code Review
parent f1654a37c5 508818d90f
commit d27fcc0998
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/templatetags/angular.py
View File

@ -112,7 +112,7 @@ def angular_templates(context):
result.extend(finder.find(relative_path, True))
path = result[-1]
try:
with open(path, encoding='utf-8') as template_file:
with open(path) as template_file:
angular_templates[template_static_path] = template_file.read()
except (OSError, IOError):
# Failed to read template, leave the template dictionary blank

9
openstack_dashboard/contrib/developer/profiler/api.py
View File

@ -22,7 +22,6 @@ from osprofiler.drivers.base import get_driver as profiler_get_driver
from osprofiler import notifier
from osprofiler import profiler
from osprofiler import web
import six
from six.moves.urllib.parse import urlparse
@ -79,8 +78,9 @@ def _get_engine(request):
def list_traces(request):
engine = _get_engine(request)
fields = ['base_id', 'timestamp', 'info.request.path', 'info']
traces = engine.list_traces(fields)
query = {"info.user_id": request.user.id}
fields = ['base_id', 'timestamp', 'info.request.path']
traces = engine.list_traces(query, fields)
return [{'id': trace['base_id'],
'timestamp': trace['timestamp'],
'origin': trace['info']['request']['path']} for trace in traces]
@ -118,9 +118,6 @@ def update_trace_headers(keys, **kwargs):
trace_info.update(kwargs)
p = profiler.get()
trace_data = utils.signed_pack(trace_info, p.hmac_key)
if six.PY3:
trace_data = [key.decode() if isinstance(key, six.binary_type)
else key for key in trace_data]
return json.dumps({web.X_TRACE_INFO: trace_data[0],
web.X_TRACE_HMAC: trace_data[1]})