Skip to content

Commit 116ec55

Browse files
committed
啥时候改的这个文件?还原
1 parent e0e8da9 commit 116ec55

1 file changed

Lines changed: 5 additions & 11 deletions

File tree

astrbot/core/computer/booters/local.py

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ async def exec(
9090
command: str,
9191
cwd: str | None = None,
9292
env: dict[str, str] | None = None,
93-
timeout: int | None = 300,
93+
timeout: int | None = 30,
9494
shell: bool = True,
9595
background: bool = False,
9696
) -> dict[str, Any]:
@@ -123,7 +123,7 @@ def _run() -> dict[str, Any]:
123123
shell=shell,
124124
cwd=working_dir,
125125
env=run_env,
126-
timeout=timeout or 300,
126+
timeout=timeout,
127127
capture_output=True,
128128
)
129129
return {
@@ -150,16 +150,10 @@ def _run() -> dict[str, Any]:
150150
[os.environ.get("PYTHON", sys.executable), "-c", code],
151151
timeout=timeout,
152152
capture_output=True,
153-
# text=True,
154-
)
155-
# stdout = "" if silent else result.stdout
156-
# stderr = result.stderr if result.returncode != 0 else ""
157-
stdout = "" if silent else _decode_shell_output(result.stdout)
158-
stderr = (
159-
_decode_shell_output(result.stderr)
160-
if result.returncode != 0
161-
else ""
153+
text=True,
162154
)
155+
stdout = "" if silent else result.stdout
156+
stderr = result.stderr if result.returncode != 0 else ""
163157
return {
164158
"data": {
165159
"output": {"text": stdout, "images": []},

0 commit comments

Comments
 (0)