openstack/zun
Code Issues Proposed changes

Merge "Replace 'faultstring' with 'title'"

Browse Source
This commit is contained in:
Jenkins 2017-04-24 14:59:03 +00:00 committed by Gerrit Code Review
commit 522d613fe0
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zun/api/hooks.py
View File

@ -110,13 +110,13 @@ class NoExceptionTracebackHook(hooks.PecanHook):
if cfg.CONF.debug and json_body.get('faultcode') != 'Server':
return
faultsting = json_body.get('faultstring')
title = json_body.get('title')
traceback_marker = 'Traceback (most recent call last):'
if faultsting and (traceback_marker in faultsting):
if title and (traceback_marker in title):
# Cut-off traceback.
faultsting = faultsting.split(traceback_marker, 1)[0]
title = title.split(traceback_marker, 1)[0]
# Remove trailing newlines and spaces if any.
json_body['faultstring'] = faultsting.rstrip()
json_body['title'] = title.rstrip()
# Replace the whole json. Cannot change original one beacause it's
# generated on the fly.
state.response.json = json_body

3
zun/api/middleware/parsable_error.py
View File

@ -70,9 +70,6 @@ class ParsableErrorMiddleware(object):
if 'title' in err and 'description' in err:
title = err['title']
desc = err['description']
elif 'faultstring' in err:
title = err['faultstring'].split('.', 1)[0]
desc = err['faultstring']
else:
title = ''
desc = ''