Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(tasks): macOS 回收子进程时容忍只剩僵尸的进程组

longmeidaobd6880cdb755
diff --git a/src/peach/task_control.py b/src/peach/task_control.py
index 851321cf9..a4b4997e9 100644
--- a/src/peach/task_control.py
+++ b/src/peach/task_control.py
@@ -5,6 +5,7 @@ import json
import os
import signal
import subprocess
+import sys
import threading
import time
import uuid
@@ -397,6 +398,10 @@ def run(command, *, capture_output=False, timeout=None, check=False, input=None,
os.killpg(process.pid, signal.SIGKILL)
except ProcessLookupError:
pass
+ except PermissionError:
+ # 进程组由 start_new_session 自建;macOS 上组内只剩未回收的僵尸时 killpg 报 EPERM。
+ if sys.platform != 'darwin':
+ raise
close_job(job)
try:
stdout, stderr = process.communicate()