jack/Chan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dryrun: timeout 套进 sudo 内层，否则 SIGTERM 未必传到 ssh

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
jack
2026-08-28 18:09:29 +08:00
co-authored by Cursor
parent 040810d48d
commit d797adc77e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
live/deploy/dryrun.sh
+3 -1
View File
@@ -53,7 +53,9 @@ echo "── 4. 能否 ssh 到采集机 ──"
# 数一下就等于对端总线的条数，之后它挂着等新内容，由 timeout 收掉。 # 数一下就等于对端总线的条数，之后它挂着等新内容，由 timeout 收掉。
rb="${SHIP_REMOTE_BUS:-\$HOME/chan-live/state/signals_live.jsonl}" rb="${SHIP_REMOTE_BUS:-\$HOME/chan-live/state/signals_live.jsonl}"
err="$(mktemp)"; outf="$(mktemp)" err="$(mktemp)"; outf="$(mktemp)"
timeout 12 sudo -u "$USER_NAME" ssh -T -o BatchMode=yes -o ConnectTimeout=10 \ # timeout 要套在 sudo **里面**：套外面时 SIGTERM 只到 sudo，未必传给 ssh，
# 于是该被收掉的 tail 会继续挂着
sudo -u "$USER_NAME" timeout 12 ssh -T -o BatchMode=yes -o ConnectTimeout=10 \
"$SHIP_FROM" "tail -c +0 -F $rb" >"$outf" 2>"$err" || true "$SHIP_FROM" "tail -c +0 -F $rb" >"$outf" 2>"$err" || true
n="$(wc -l < "$outf")" n="$(wc -l < "$outf")"
if grep -qi "Host key verification failed" "$err"; then if grep -qi "Host key verification failed" "$err"; then