github_mirrors/websoft9
1
0
Fork 0
mirror of https://github.com/Websoft9/websoft9.git synced 2025-02-03 09:48:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update shell_execute.py

Browse Source
This commit is contained in:
qiaofeng1227 2023-03-24 11:48:04 +08:00 committed by GitHub
parent e106771a22
commit 6ce298ce6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appmanage/api/utils/shell_execute.py
View File

@ -14,7 +14,7 @@ def execute_command_output_all(cmd_str, max_time = 3):
myLogger.info_logger("Start to execute cmd: " + cmd_str)
execute_time = 0
while execute_time < max_time:
process = subprocess.run(convert_command(cmd_str), shell=True, stdout=subprocess.PIPE, universal_newlines=True)
process = subprocess.run(convert_command(cmd_str), capture_output=True, check=True, text=True, shell=True)
if process.returncode == 0:
return {"code": "0", "result": process.stdout,}
else:
@ -28,6 +28,6 @@ def convert_command(cmd_str):
if cmd_str == "":
convert_cmd=cmd_str
else:
convert_cmd='chroot /host ' + cmd_str
convert_cmd="f'nsenter -m -u -i -n -p -t 1 sh -c " +cmd_str
return convert_cmd