monitoring: drop remaining run-until-done from GOA ladder
This commit is contained in:
parent
b6c3225e97
commit
d2113e7362
1 changed files with 3 additions and 14 deletions
|
|
@ -663,12 +663,7 @@ else:
|
|||
fi
|
||||
}
|
||||
|
||||
# Short bounded select assist (≤8s) — not a hang path; helps attach fresh reserve_pub
|
||||
if command -v perl >/dev/null 2>&1 && [ -f "$CLI_JS" ]; then
|
||||
perl -e 'alarm shift; exec @ARGV' 8 \
|
||||
node "$CLI_JS" --wallet-db="$WDB" --no-throttle run-until-done \
|
||||
>"$SCRATCH/select-$tag.out" 2>&1 || true
|
||||
fi
|
||||
# No run-until-done (hangs / banned). Read transactions only for reserve_pub candidates.
|
||||
wcli transactions >"$SCRATCH/tx-$tag.json" 2>&1 || true
|
||||
|
||||
t0=$(now_ms)
|
||||
|
|
@ -965,19 +960,12 @@ except Exception: print("")
|
|||
ms_handle=$(elapsed_ms "$t0")
|
||||
ok "handle-uri $PAMT ${ms_handle}ms"
|
||||
|
||||
# Short settle polls (bounded — no infinite hang)
|
||||
# Short settle polls: merchant order + wallet tx only — never run-until-done
|
||||
t0=$(now_ms)
|
||||
settled=0
|
||||
r=0
|
||||
while [ "$r" -lt "${LADDER_PAY_SETTLE_ROUNDS}" ]; do
|
||||
r=$((r + 1))
|
||||
if command -v perl >/dev/null 2>&1; then
|
||||
perl -e 'alarm shift; exec @ARGV' 10 \
|
||||
"$CLI_JS" --wallet-db="$WDB" --no-throttle run-until-done \
|
||||
>"$SCRATCH/pay-run-$ptag.out" 2>&1 || true
|
||||
else
|
||||
wcli run-until-done >"$SCRATCH/pay-run-$ptag.out" 2>&1 || true
|
||||
fi
|
||||
wcli transactions >"$SCRATCH/tx-$ptag.out" 2>&1 || true
|
||||
curl -skS -m 8 -o "$SCRATCH/ord-paid-$ptag.json" -H "$AUTH" \
|
||||
"${MER}/instances/${INST}/private/orders/${OID}" 2>/dev/null || true
|
||||
|
|
@ -989,6 +977,7 @@ sys.exit(0 if d.get("paid") is True or str(d.get("order_status","")).lower()=="p
|
|||
settled=1
|
||||
break
|
||||
fi
|
||||
sleep 0.5
|
||||
done
|
||||
ms_psettle=$(elapsed_ms "$t0")
|
||||
ms_total=$(elapsed_ms "$t_pay")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue