






















@@ -3,7 +3,7 @@
33// to bare/functional images, and runs lanes through weighted resource pools.
44import { spawn } from "node:child_process";
55import fs from "node:fs";
6-import { mkdir, readFile } from "node:fs/promises";
6+import { mkdir, open, readFile } from "node:fs/promises";
77import path from "node:path";
88import { fileURLToPath } from "node:url";
99import {
@@ -37,6 +37,7 @@ const DEFAULT_LANE_START_STAGGER_MS = 2_000;
3737const DEFAULT_STATUS_INTERVAL_MS = 30_000;
3838const DEFAULT_PREFLIGHT_RUN_TIMEOUT_MS = 60_000;
3939export const SHELL_CAPTURE_MAX_CHARS = 1024 * 1024;
40+export const LOG_TAIL_MAX_BYTES = 1024 * 1024;
4041const DEFAULT_TIMINGS_FILE = path.join(ROOT_DIR, ".artifacts/docker-tests/lane-timings.json");
4142const DEFAULT_GITHUB_WORKFLOW = "openclaw-live-and-e2e-checks-reusable.yml";
4243const IS_MAIN = process.argv[1]
@@ -533,7 +534,7 @@ export function dockerPreflightContainerNames(raw) {
533534);
534535}
535536536-function runShellCommand({ command, env, label, logFile, timeoutMs, noOutputTimeoutMs }) {
537+export function runShellCommand({ command, env, label, logFile, timeoutMs, noOutputTimeoutMs }) {
537538return new Promise((resolve) => {
538539const pipeOutput = Boolean(logFile || noOutputTimeoutMs > 0);
539540const child = spawn("bash", ["-c", command], {
@@ -609,6 +610,9 @@ function runShellCommand({ command, env, label, logFile, timeoutMs, noOutputTime
609610if (noOutputTimer) {
610611clearTimeout(noOutputTimer);
611612}
613+if (timedOut) {
614+terminateChild(child, "SIGKILL");
615+}
612616if (killTimer) {
613617clearTimeout(killTimer);
614618}
@@ -635,7 +639,7 @@ export function appendBoundedShellCapture(current, chunk, maxChars = SHELL_CAPTU
635639return { text: combined.slice(-maxChars), truncated: true };
636640}
637641638-function runShellCaptureCommand({ command, env, label, timeoutMs }) {
642+export function runShellCaptureCommand({ command, env, label, timeoutMs }) {
639643return new Promise((resolve) => {
640644const child = spawn("bash", ["-c", command], {
641645cwd: ROOT_DIR,
@@ -649,12 +653,14 @@ function runShellCaptureCommand({ command, env, label, timeoutMs }) {
649653let stdoutTruncated = false;
650654let stderrTruncated = false;
651655let timedOut = false;
656+let killTimer;
652657const timeoutTimer =
653658timeoutMs > 0
654659 ? setTimeout(() => {
655660timedOut = true;
656661terminateChild(child, "SIGTERM");
657-setTimeout(() => terminateChild(child, "SIGKILL"), 10_000).unref?.();
662+killTimer = setTimeout(() => terminateChild(child, "SIGKILL"), 10_000);
663+killTimer.unref?.();
658664}, timeoutMs)
659665 : undefined;
660666timeoutTimer?.unref?.();
@@ -672,6 +678,12 @@ function runShellCaptureCommand({ command, env, label, timeoutMs }) {
672678if (timeoutTimer) {
673679clearTimeout(timeoutTimer);
674680}
681+if (timedOut) {
682+terminateChild(child, "SIGKILL");
683+}
684+if (killTimer) {
685+clearTimeout(killTimer);
686+}
675687activeChildren.delete(child);
676688const exitCode = typeof status === "number" ? status : signal ? 128 : 1;
677689resolve({
@@ -1078,8 +1090,21 @@ async function runLanePool(poolLanes, baseEnv, logDir, parallelism, options) {
10781090return { failures, results };
10791091}
108010921081-async function tailFile(file, lines) {
1082-const content = await readFile(file, "utf8").catch(() => "");
1093+export async function tailFile(file, lines, maxBytes = LOG_TAIL_MAX_BYTES) {
1094+let handle;
1095+let content;
1096+try {
1097+handle = await open(file, "r");
1098+const stat = await handle.stat();
1099+const bytesToRead = Math.min(Math.max(1, maxBytes), stat.size);
1100+const buffer = Buffer.alloc(bytesToRead);
1101+await handle.read(buffer, 0, bytesToRead, stat.size - bytesToRead);
1102+content = buffer.toString("utf8");
1103+} catch {
1104+content = "";
1105+} finally {
1106+await handle?.close().catch(() => {});
1107+}
10831108const tail = content.split(/\r?\n/).slice(-lines).join("\n");
10841109return tail.trimEnd();
10851110}
此内容由惯性聚合(RSS阅读器)自动聚合整理,仅供阅读参考。 原文来自 — 版权归原作者所有。