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

Rework how errors are output

Browse source 
Changed the way we do errors, as throwing exceptions for any missing marker
is a bit overkill. Just log a error if both markers are missing, this is the
case of the user existing but not allowing logins. We would not get a env back.
For backwards compat we will just log this and let the cmd try to be executed.

Getting back just one marker indicates something went very badly with the Python
code and is worthy of an exception.
This commit is contained in:
psyer 2018-03-20 12:59:29 -04:00
parent dc283940e0
commit 4ee723ac0f
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
salt/modules/cmdmod.py
View file

@ -454,29 +454,33 @@ def _run(cmd,
env_encoded = env_encoded.encode(__salt_system_encoding__)
env_encoded_org = env_encoded
env_mark = env_encoded.find(marker_b + b'\n')
if env_mark < 0:
raise CommandExecutionError(
'Environment could not be retrieved for User \'{0}\':'
' missing first marker, got err={1} out={2}'.format(
runas,
repr(env_encoded_err),
repr(env_encoded_org)
)
)
# strip first marker line plus newline
env_encoded = env_encoded[env_mark + len(marker) + 1:]
first_marker_found = False
if env_mark >= 0:
# strip first marker line plus newline
env_encoded = env_encoded[env_mark + len(marker) + 1:]
first_marker_found = True
env_mark = env_encoded.find(b'\n' + marker_b + b'\n')
if env_mark < 0:
second_marker_found = False
if env_mark >= 0:
# strip second marker line plus leading newline
env_encoded = env_encoded[0:env_mark]
second_marker_found = True
if first_marker_found == second_marker_found:
if not first_marker_found:
log.error('Unable to retrieve environment for \'%s\': err=%s out=%s',
runas,
repr(env_encoded_err),
repr(env_encoded_org)
)
else:
raise CommandExecutionError(
'Environment could not be retrieved for User \'{0}\':'
' second marker, got err={1} out={2}'.format(
' missing a marker, got err={1!r} out={2!r}'.format(
runas,
repr(env_encoded_err),
repr(env_encoded_org)
)
)
# strip second marker line plus leading newline
env_encoded = env_encoded[0:env_mark]
if six.PY2:
import itertools