From 6f3161dcf8c2c1ac91dfc610c4a1bf361a6cff90 Mon Sep 17 00:00:00 2001 From: cxlgo <41188938+cxlgo@users.noreply.github.com> Date: Mon, 26 Nov 2018 18:35:59 +0800 Subject: [PATCH 1/6] Update tasks.py to resolve issue 15 (Script execution hang forever) --- script_runner/tasks.py | 1 + 1 file changed, 1 insertion(+) diff --git a/script_runner/tasks.py b/script_runner/tasks.py index aecfa7f..d30f285 100644 --- a/script_runner/tasks.py +++ b/script_runner/tasks.py @@ -207,6 +207,7 @@ def execute(script_path, ctx, process): cwd=cwd, bufsize=1, close_fds=on_posix) + process.communicate() return_code = None From a9fa66c221b97a98901f42c663510f04f9e8cbf2 Mon Sep 17 00:00:00 2001 From: cxlgo <41188938+cxlgo@users.noreply.github.com> Date: Thu, 29 Nov 2018 09:10:15 +0800 Subject: [PATCH 2/6] Update tasks.py to resolve issue 15 --- script_runner/tasks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script_runner/tasks.py b/script_runner/tasks.py index d30f285..af205d4 100644 --- a/script_runner/tasks.py +++ b/script_runner/tasks.py @@ -201,13 +201,12 @@ def execute(script_path, ctx, process): process = subprocess.Popen(command, shell=True, - stdout=subprocess.PIPE, + stdout=None, stderr=subprocess.PIPE, env=env, cwd=cwd, bufsize=1, close_fds=on_posix) - process.communicate() return_code = None From f77021798ae0ec4f43c9d5d5893ecf28c50a3f32 Mon Sep 17 00:00:00 2001 From: cxlgo <41188938+cxlgo@users.noreply.github.com> Date: Thu, 29 Nov 2018 10:32:17 +0800 Subject: [PATCH 3/6] Update tasks.py to resolve issue 15# --- script_runner/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script_runner/tasks.py b/script_runner/tasks.py index af205d4..f4b96a6 100644 --- a/script_runner/tasks.py +++ b/script_runner/tasks.py @@ -201,13 +201,13 @@ def execute(script_path, ctx, process): process = subprocess.Popen(command, shell=True, - stdout=None, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env, cwd=cwd, bufsize=1, close_fds=on_posix) - + process.wait() return_code = None stdout_consumer = OutputConsumer(process.stdout) From f66659e748245e1a349607570b64bab5127892ab Mon Sep 17 00:00:00 2001 From: cxlgo <41188938+cxlgo@users.noreply.github.com> Date: Thu, 29 Nov 2018 11:00:12 +0800 Subject: [PATCH 4/6] Update tasks.py to resolve issue 15# --- script_runner/tasks.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script_runner/tasks.py b/script_runner/tasks.py index f4b96a6..4a265e4 100644 --- a/script_runner/tasks.py +++ b/script_runner/tasks.py @@ -207,7 +207,6 @@ def execute(script_path, ctx, process): cwd=cwd, bufsize=1, close_fds=on_posix) - process.wait() return_code = None stdout_consumer = OutputConsumer(process.stdout) @@ -305,7 +304,7 @@ def __init__(self, out): self.consumer.start() def consume_output(self): - for line in iter(self.out.readline, b''): + for line in self.out.readlines(): self.buffer.write(line) self.out.close() From c5a0650f1ef5a230db52b2f1fb16e39c91c704ba Mon Sep 17 00:00:00 2001 From: cxlgo <41188938+cxlgo@users.noreply.github.com> Date: Thu, 29 Nov 2018 11:23:49 +0800 Subject: [PATCH 5/6] Update tasks.py to resolve issue 15# --- script_runner/tasks.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script_runner/tasks.py b/script_runner/tasks.py index 4a265e4..e7990eb 100644 --- a/script_runner/tasks.py +++ b/script_runner/tasks.py @@ -208,6 +208,7 @@ def execute(script_path, ctx, process): bufsize=1, close_fds=on_posix) return_code = None + process.wait() stdout_consumer = OutputConsumer(process.stdout) stderr_consumer = OutputConsumer(process.stderr) @@ -304,7 +305,7 @@ def __init__(self, out): self.consumer.start() def consume_output(self): - for line in self.out.readlines(): + for line in iter(self.out.readline, b''): self.buffer.write(line) self.out.close() From 94d19d32de55f621640a4e0f5e089a5876714cb3 Mon Sep 17 00:00:00 2001 From: cxlgo <41188938+cxlgo@users.noreply.github.com> Date: Thu, 29 Nov 2018 11:24:02 +0800 Subject: [PATCH 6/6] Update tasks.py to resolve issue 15#