fix(deploy): 构建抓取通道可配+构建日志落盘——ESA 522 事故双根治

- build.sh:BLOG_GIT_URL 环境变量(默认公网,同机构建可指内网
  http://127.0.0.1:13020);每次构建 remote set-url 后 fetch——
  2026-10-26 事故:ESA 边缘对 git.wait4x.online 522 时公网 fetch
  set -e 静默死,staging 冻结 150s+ 无痕
- webhook_receiver.py:构建输出落盘 ~/docker_apps/blog/build.log
  (capture_output 丢弃=黑洞,本次事故"构建为何没跑"零证据);
  与运行副本双同步纪律维持
- 宿主 unit 补 BLOG_GIT_URL 内网通道(配置在 unit 不在仓——主机
  特定值不污染仓库默认)

验证: 手动构建实测 stamp=19b2390+robots.txt 352B 上线;18743 测试
      床恢复 200;smoke 对 staging 软门容忍符合 T1 转硬门前设计

Spec: none (发布链通道与可观测性修复,事故驱动)

Co-authored-by: GLM-5.3
This commit is contained in:
wait4xandGLM-5.3 committed 2026-11-01 09:58:47 +08:00
1 parent 19b2390cbf
commit bb29c8abaf
2 files changed
+16 -6

No files matched your search

+7 -1
View File
@@ -6,15 +6,21 @@
# 发布。改为独立构建仓 fetch+reset 硬跟 main:线上=远端 main,确定性闭环。 # 发布。改为独立构建仓 fetch+reset 硬跟 main:线上=远端 main,确定性闭环。
# blog 仓已公开,匿名 fetch 无需凭据。 # blog 仓已公开,匿名 fetch 无需凭据。
set -e set -e
# 抓取 URL:默认公网;同机构建可由宿主环境变量覆盖为内网
# (2026-10-26 事故:ESA 边缘对 git.wait4x.online 522 时公网 fetch 失败,
# set -e 下静默死、staging 冻结——内网通道必须可用)
BLOG_GIT_URL="${BLOG_GIT_URL:-https://git.wait4x.online/wait4x/blog.git}"
BUILD_REPO="$HOME/docker_apps/blog/build-repo" BUILD_REPO="$HOME/docker_apps/blog/build-repo"
STAGING="$HOME/docker_apps/blog/www-staging" STAGING="$HOME/docker_apps/blog/www-staging"
if [ ! -d "$BUILD_REPO/.git" ]; then if [ ! -d "$BUILD_REPO/.git" ]; then
echo "[build] 首次克隆构建仓" echo "[build] 首次克隆构建仓"
git clone https://git.wait4x.online/wait4x/blog.git "$BUILD_REPO" git clone "$BLOG_GIT_URL" "$BUILD_REPO"
fi fi
cd "$BUILD_REPO" cd "$BUILD_REPO"
# 每次构建把 origin 指向配置的 URL(同机构建走内网通道;公网 522 时仍可发布)
git remote set-url origin "$BLOG_GIT_URL"
git fetch origin main git fetch origin main
git reset --hard origin/main git reset --hard origin/main
git clean -fd --exclude node_modules git clean -fd --exclude node_modules
+9 -5
View File
@@ -85,11 +85,15 @@ class Handler(BaseHTTPRequestHandler):
def _run_build(self) -> None: def _run_build(self) -> None:
with BUILD_LOCK: with BUILD_LOCK:
subprocess.run( # 输出落盘:capture_output 丢弃是调试黑洞(2026-10-26 ESA 522
["bash", str(build_script())], # 事件中构建静默死、staging 冻结无任何可见痕迹)
capture_output=True, timeout=1200, log = Path.home() / "docker_apps/blog/build.log"
cwd=str(BUILD_REPO), with open(log, "wb") as fh:
) subprocess.run(
["bash", str(build_script())],
stdout=fh, stderr=subprocess.STDOUT, timeout=1200,
cwd=str(BUILD_REPO),
)
def log_message(self, fmt: str, *args: object) -> None: def log_message(self, fmt: str, *args: object) -> None:
# 静默常规访问日志(健康探针会刷屏);错误仍走默认 stderr # 静默常规访问日志(健康探针会刷屏);错误仍走默认 stderr