cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

remove usless tb initiator

Browse source 
always pass proper tb
This commit is contained in:
Brian Coca 2019-01-21 12:47:02 -05:00 committed by Brian Coca
parent f018b9d07d
commit 8fd0fbe431
2 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/errors/__init__.py
View file

@ -20,8 +20,6 @@ from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import re
import sys
import traceback
from ansible.errors.yaml_strings import (
YAML_COMMON_DICT_ERROR,
@ -72,8 +70,6 @@ class AnsibleError(Exception):
if orig_exc:
self.orig_exc = orig_exc
self.tb = ''.join(traceback.format_tb(sys.exc_info()[2]))
def __str__(self):
return self.message

15
lib/ansible/inventory/manager.py
View file

@ -275,13 +275,12 @@ class InventoryManager(object):
break
except AnsibleParserError as e:
display.debug('%s was not parsable by %s' % (source, plugin_name))
# Ansible error was created before the exception has been processed,
# so traceback can only be obtained within this context
e.tb = ''.join(traceback.format_tb(sys.exc_info()[2]))
failures.append({'src': source, 'plugin': plugin_name, 'exc': e})
tb = ''.join(traceback.format_tb(sys.exc_info()[2]))
failures.append({'src': source, 'plugin': plugin_name, 'exc': e, 'tb': tb})
except Exception as e:
display.debug('%s failed to parse %s' % (plugin_name, source))
failures.append({'src': source, 'plugin': plugin_name, 'exc': AnsibleError(e)})
display.debug('%s failed while attempting to parse %s' % (plugin_name, source))
tb = ''.join(traceback.format_tb(sys.exc_info()[2]))
failures.append({'src': source, 'plugin': plugin_name, 'exc': AnsibleError(e), 'tb': tb})
else:
display.vvv("%s declined parsing %s as it did not pass it's verify_file() method" % (plugin_name, source))
else:
@ -289,8 +288,8 @@ class InventoryManager(object):
# only if no plugin processed files should we show errors.
for fail in failures:
display.warning(u'\n* Failed to parse %s with %s plugin: %s' % (to_text(fail['src']), fail['plugin'], to_text(fail['exc'])))
if hasattr(fail['exc'], 'tb'):
display.vvv(to_text(fail['exc'].tb))
if 'tb' in fail:
display.vvv(to_text(fail['tb']))
if C.INVENTORY_ANY_UNPARSED_IS_FAILED:
raise AnsibleError(u'Completely failed to parse inventory source %s' % (source))
if not parsed: