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 #23274 from basepi/salt-ssh.debug.verbosity

Browse source 
[2014.7] Reduce salt-ssh debug log verbosity
This commit is contained in:
Colton Myers 2015-05-01 14:19:23 -06:00
commit ce24315a4b
3 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/client/ssh/__init__.py
View file

@ -850,8 +850,8 @@ ARGS = {9}\n'''.format(self.minion_config,
cmd_str = self._cmd_str()
stdout, stderr, retcode = self.shim_cmd(cmd_str)
log.debug('STDOUT {1}\n{0}'.format(stdout, self.target['host']))
log.debug('STDERR {1}\n{0}'.format(stderr, self.target['host']))
log.trace('STDOUT {1}\n{0}'.format(stdout, self.target['host']))
log.trace('STDERR {1}\n{0}'.format(stderr, self.target['host']))
log.debug('RETCODE {1}: {0}'.format(retcode, self.target['host']))
error = self.categorize_shim_errors(stdout, stderr, retcode)

8
salt/client/ssh/shell.py
View file

@ -285,7 +285,11 @@ class Shell(object):
logmsg = 'Executing command: {0}'.format(cmd)
if self.passwd:
logmsg = logmsg.replace(self.passwd, ('*' * 6))
log.debug(logmsg)
if 'decode("base64")' in logmsg:
log.debug('Executed SHIM command. Command logged to TRACE')
log.trace(logmsg)
else:
log.debug(logmsg)
ret = self._run_cmd(cmd)
return ret
@ -313,7 +317,9 @@ class Shell(object):
cmd,
shell=True,
log_stdout=True,
log_stdout_level='trace',
log_stderr=True,
log_stderr_level='trace',
stream_stdout=False,
stream_stderr=False)
sent_passwd = 0

7
salt/utils/vt.py
View file

@ -216,7 +216,12 @@ class Terminal(object):
'Child Forked! PID: {0} STDOUT_FD: {1} STDERR_FD: '
'{2}'.format(self.pid, self.child_fd, self.child_fde)
)
log.debug('Terminal Command: {0}'.format(' '.join(self.args)))
terminal_command = ' '.join(self.args)
if 'decode("base64")' in terminal_command:
log.debug('VT: Salt-SSH SHIM Terminal Command executed. Logged to TRACE')
log.trace('Terminal Command: {0}'.format(terminal_command))
else:
log.debug('Terminal Command: {0}'.format(terminal_command))
# <---- Spawn our terminal -------------------------------------------
# ----- Setup Logging ----------------------------------------------->