ahamilton/eris
1
0
Fork 0
Code Releases Activity

Let a timeout be passed to _run_command.

Browse source
This commit is contained in:
Andrew Hamilton 2018-05-25 10:59:22 +10:00
parent 02844de562
commit ecf382e6de
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
vigil/tools.py
View file

@ -117,10 +117,11 @@ def _do_command(command, timeout=None, **kwargs):
return _fix_input(stdout), _fix_input(stderr), process.returncode
def _run_command(command, success_status=None, error_status=None):
def _run_command(command, success_status=None, error_status=None,
timeout=None):
success_status = Status.ok if success_status is None else success_status
error_status = Status.problem if error_status is None else error_status
stdout, stderr, returncode = _do_command(command)
stdout, stderr, returncode = _do_command(command, timeout)
result_status = success_status if returncode == 0 else error_status
return result_status, fill3.Text(stdout + stderr)