Merge "Fix logging when "Duplicate document exists" error occurs"

This commit is contained in:
Zuul 2018-11-06 15:51:50 +00:00 committed by Gerrit Code Review
commit 2f596fd627
1 changed files with 12 additions and 11 deletions

View File

@ -329,17 +329,18 @@ class DocumentLayering(object):
error_list = [] error_list = []
for result in results: for result in results:
for e in result['errors']: for e in result['errors']:
LOG.error('Document [%s, %s] %s failed with pre-validation ' for d in e['documents']:
'error: %s.', e['schema'], e['layer'], e['name'], LOG.error('Document [%s, %s] %s failed with '
e['message']) 'pre-validation error: "%s". Diagnostic: "%s".',
error_list.append( d['schema'], d['layer'], d['name'],
ValidationMessage( e['message'], e['diagnostic'])
message=e['message'],
doc_schema=e['schema'], error_list.append(
doc_name=e['name'], ValidationMessage(
doc_layer=e['layer'] message=e['message'],
) doc_schema=d['schema'],
) doc_name=d['name'],
doc_layer=d['layer']))
if error_list: if error_list:
raise errors.InvalidDocumentFormat(error_list=error_list) raise errors.InvalidDocumentFormat(error_list=error_list)