pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Always read all available lines from stdout and stderr

Browse source 
Should produce faster output.
This commit is contained in:
Gina Häußge 2016-02-11 10:24:11 +01:00
parent f07e3d9f2d
commit eacd9f7b66
1 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/octoprint/util/commandline.py
View file

@ -84,34 +84,34 @@ class CommandlineCaller(object):
all_stderr = []
try:
while p.returncode is None:
line = p.stderr.readline(timeout=0.5)
if line:
line, = self._preprocess_lines(line)
self._log_stderr(line)
all_stderr.append(line)
lines = p.stderr.readlines(timeout=0.5)
if lines:
lines = self._preprocess_lines(*lines)
self._log_stderr(*lines)
all_stderr += list(lines)
line = p.stdout.readline(timeout=0.5)
if line:
line, = self._preprocess_lines(line)
self._log_stdout(line)
all_stdout.append(line)
lines = p.stdout.readlines(timeout=0.5)
if lines:
lines = self._preprocess_lines(*lines)
self._log_stdout(*lines)
all_stdout += list(lines)
p.commands[0].poll()
finally:
p.close()
stderr = p.stderr.text
if stderr:
split_lines = self._preprocess_lines(*stderr.split("\n"))
self._log_stderr(*split_lines)
all_stderr += split_lines
lines = p.stderr.readlines()
if lines:
lines = self._preprocess_lines(*lines)
self._log_stderr(*lines)
all_stderr += lines
stdout = p.stdout.text
if stdout:
split_lines = self._preprocess_lines(*stdout.split("\n"))
self._log_stdout(*split_lines)
all_stdout += split_lines
lines = p.stdout.readlines()
if lines:
lines = self._preprocess_lines(*lines)
self._log_stdout(*lines)
all_stdout += lines
return p.returncode, all_stdout, all_stderr