valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VT now consumes all of its data when looping using its has_unread_data attribute

Browse Source
This commit is contained in:
Pedro Algarvio 2014-10-18 23:02:42 +01:00
parent 828e0997df
commit bf494e6577
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/modules/cmdmod.py
View File

@ -408,10 +408,8 @@ def _run(cmd,
log_stderr_level=output_loglevel,
stream_stdout=True,
stream_stderr=True)
# consume output
finished = False
ret['pid'] = proc.pid
while not finished:
while proc.has_unread_data:
try:
try:
time.sleep(0.5)
@ -427,8 +425,6 @@ def _run(cmd,
stderr += cstderr
else:
cstderr = ''
if not cstdout and not cstderr and not proc.isalive():
finished = True
if timeout and (time.time() > will_timeout):
ret['stderr'] = (
'SALT: Timeout after {0}s\n{1}').format(
@ -448,7 +444,9 @@ def _run(cmd,
# only set stdout on success as we already mangled in other
# cases
ret['stdout'] = stdout
if finished:
if not proc.isalive():
# Process terminated, ie, not canceled by the user or by
# the timeout
ret['stderr'] = stderr
ret['retcode'] = proc.exitstatus
ret['pid'] = proc.pid