OMGeeky/gpt-pilot
1
0
Fork 0
mirror of https://github.com/OMGeeky/gpt-pilot.git synced 2026-01-06 19:29:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Kill the process and the subprocesses after running a command + add both stdout and stderr to the return value of running a command

Browse Source
This commit is contained in:
Zvonimir Sabljic
2023-08-05 08:36:12 +02:00
parent b82a7b79d4
commit 3bcfa4a70e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
euclid/helpers/cli.py
View File

@@ -24,6 +24,7 @@ def run_command(command, root_path, q_stdout, q_stderr, pid_container):
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
preexec_fn=os.setsid,
cwd=root_path
)
pid_container[0] = process.pid
@@ -78,7 +79,7 @@ def execute_command(project, command, timeout=5000):
# If timeout is reached, kill the process
if elapsed_time * 1000 > timeout:
os.kill(pid_container[0], signal.SIGKILL)
os.killpg(pid_container[0], signal.SIGKILL)
break
try:
@@ -95,7 +96,10 @@ def execute_command(project, command, timeout=5000):
stderr_output += q_stderr.get_nowait()
if return_value is None:
return_value = output[-2000:] if output != '' else stderr_output[-2000:]
return_value = ''
if stderr_output != '':
return_value = 'stderr:\n```\n' + stderr_output[-2000:] + '\n```\n'
return_value += 'stdout:\n```\n' + output[-2000:] + '\n```'
command_run = save_command_run(project, command, return_value)