johba/disinto
1
0
Fork 0
Code Issues 4 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge pull request 'fix: P4 sweep uses ${PROJECT_NAME} without fallback, unlike proj_name (#429)' (#594) from fix/issue-429 into main

Browse source
This commit is contained in:
johba 2026-03-23 10:14:02 +01:00
commit 8382d245fb
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
supervisor/supervisor-poll.sh
View file

@ -325,14 +325,14 @@ check_project() {
# Dev-agent health (only if monitoring enabled) # Dev-agent health (only if monitoring enabled)
if [ "${CHECK_DEV_AGENT:-true}" = "true" ]; then if [ "${CHECK_DEV_AGENT:-true}" = "true" ]; then
DEV_LOCK="/tmp/dev-agent-${PROJECT_NAME}.lock" DEV_LOCK="/tmp/dev-agent-${proj_name}.lock"
if [ -f "$DEV_LOCK" ]; then if [ -f "$DEV_LOCK" ]; then
DEV_PID=$(cat "$DEV_LOCK" 2>/dev/null) DEV_PID=$(cat "$DEV_LOCK" 2>/dev/null)
if ! kill -0 "$DEV_PID" 2>/dev/null; then if ! kill -0 "$DEV_PID" 2>/dev/null; then
rm -f "$DEV_LOCK" rm -f "$DEV_LOCK"
fixed "${proj_name}: Removed stale dev-agent lock (PID ${DEV_PID} dead)" fixed "${proj_name}: Removed stale dev-agent lock (PID ${DEV_PID} dead)"
else else
DEV_STATUS_AGE=$(stat -c %Y "/tmp/dev-agent-status-${PROJECT_NAME:-default}" 2>/dev/null || echo 0) DEV_STATUS_AGE=$(stat -c %Y "/tmp/dev-agent-status-${proj_name}" 2>/dev/null || echo 0)
NOW_EPOCH=$(date +%s) NOW_EPOCH=$(date +%s)
STATUS_AGE_MIN=$(( (NOW_EPOCH - DEV_STATUS_AGE) / 60 )) STATUS_AGE_MIN=$(( (NOW_EPOCH - DEV_STATUS_AGE) / 60 ))
if [ "$STATUS_AGE_MIN" -gt 30 ]; then if [ "$STATUS_AGE_MIN" -gt 30 ]; then
@ -746,7 +746,7 @@ Instructions:
# P4-PROJECT: Clean stale worktrees for this project # P4-PROJECT: Clean stale worktrees for this project
# =========================================================================== # ===========================================================================
NOW_TS=$(date +%s) NOW_TS=$(date +%s)
for wt in /tmp/${PROJECT_NAME}-worktree-* /tmp/${PROJECT_NAME}-review-* /tmp/${PROJECT_NAME}-sup-retry-*; do for wt in /tmp/${proj_name}-worktree-* /tmp/${proj_name}-review-* /tmp/${proj_name}-sup-retry-*; do
[ -d "$wt" ] || continue [ -d "$wt" ] || continue
WT_AGE_MIN=$(( (NOW_TS - $(stat -c %Y "$wt")) / 60 )) WT_AGE_MIN=$(( (NOW_TS - $(stat -c %Y "$wt")) / 60 ))
if [ "$WT_AGE_MIN" -gt 120 ]; then if [ "$WT_AGE_MIN" -gt 120 ]; then