saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #23748 from basepi/salt-ssh.roster.host.check

Browse source 
[2014.7] Log salt-ssh roster render errors more assertively and verbosely
This commit is contained in:
Colton Myers 2015-05-14 16:38:10 -06:00
commit 808bbe1cb2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/renderers/yaml.py
View file

@ -47,7 +47,7 @@ def render(yaml_data, saltenv='base', sls='', argline='', **kws):
try:
data = load(yaml_data, Loader=get_yaml_loader(argline))
except ScannerError as exc:
err_type = _ERROR_MAP.get(exc.problem, 'Unknown yaml render error')
err_type = _ERROR_MAP.get(exc.problem, exc.problem)
line_num = exc.problem_mark.line + 1
raise SaltRenderError(err_type, line_num, exc.problem_mark.buffer)
except ConstructorError as exc:

2
salt/roster/__init__.py
View file

@ -67,7 +67,7 @@ class Roster(object):
try:
targets.update(self.rosters[f_str](tgt, tgt_type))
except salt.exceptions.SaltRenderError as exc:
log.debug('Unable to render roster file: {0}'.format(exc.error))
log.error('Unable to render roster file: {0}'.format(exc))
except IOError as exc:
pass