merge: develop(FFmpeg超时保护) into stream-copy分支
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 1m57s
CI/CD Pipeline / Production Browser E2E (pull_request) Failing after 1564h14m49s
CI/CD Pipeline / Build Production Runtime Images (pull_request) Failing after 1564h14m54s
CI/CD Pipeline / Build & Push Staging (Watchtower auto-deploy) (pull_request) Failing after 1564h14m54s
CI/CD Pipeline / Deploy Production (pull_request) Failing after 1564h14m51s
CI/CD Pipeline / Staging API Integration Tests (pull_request) Failing after 1564h14m51s
CI/CD Pipeline / Integration Tests (pull_request) Has been skipped
CI/CD Pipeline / Frontend Lint (pull_request) Has been skipped
CI/CD Pipeline / Staging E2E Tests (pull_request) Failing after 1564h46m26s

This commit is contained in:
Deploy Bot
2026-07-13 11:09:09 +08:00
3 changed files with 305 additions and 100 deletions
+1 -1
View File
@@ -81,7 +81,7 @@ def run_ffmpeg(
timeout=timeout,
)
return (result.stdout or "", result.stderr or "")
except subprocess.TimeoutExpired:
except subprocess.TimeoutExpired as e:
logger.error(
"FFmpeg 命令超时 (%ds): command=%s",
timeout or -1,