From 3fb5d11bd9613fe4e6f78a2160908b2770329686 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 2 Apr 2026 12:27:54 -0400 Subject: [PATCH 1/2] Look up old builds in /extra/builds/ when not in primary location --- config.rkt | 1 + dirstruct.rkt | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/config.rkt b/config.rkt index 582dceb..7eafa2f 100644 --- a/config.rkt +++ b/config.rkt @@ -7,6 +7,7 @@ "monitor-scm.rkt") (plt-directory "/opt/plt") +(extra-build-directory "/extra/builds") (drdr-directory "/opt/svn/drdr") (git-path "/usr/bin/git") (Xvfb-path "/usr/bin/Xnest") diff --git a/dirstruct.rkt b/dirstruct.rkt index 005a80b..55d98b8 100644 --- a/dirstruct.rkt +++ b/dirstruct.rkt @@ -58,8 +58,18 @@ (define previous-rev (make-parameter #f)) +(define extra-build-directory + (make-parameter #f)) + (define (revision-dir rev) - (build-path (plt-build-directory) (number->string rev))) + (define primary (build-path (plt-build-directory) (number->string rev))) + (if (or (directory-exists? primary) + (not (extra-build-directory))) + primary + (let ([extra (build-path (extra-build-directory) (number->string rev))]) + (if (directory-exists? extra) + extra + primary)))) (define (revision-log-dir rev) (build-path (revision-dir rev) "logs")) @@ -111,6 +121,7 @@ [previous-rev (parameter/c (or/c false/c exact-nonnegative-integer?))] [plt-directory (parameter/c path-string?)] [plt-build-directory (-> path?)] + [extra-build-directory (parameter/c (or/c false/c path-string?))] [plt-data-directory (-> path?)] [plt-future-build-directory (-> path?)] [drdr-directory (parameter/c path-string?)] From 5913360a9a069ae25047b47e09c7ba486e8fb4d6 Mon Sep 17 00:00:00 2001 From: Sam Tobin-Hochstadt Date: Thu, 2 Apr 2026 12:36:10 -0400 Subject: [PATCH 2/2] Show disk usage in status pane --- scripts/monitor.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/monitor.sh b/scripts/monitor.sh index 2367618..a797fd4 100755 --- a/scripts/monitor.sh +++ b/scripts/monitor.sh @@ -71,7 +71,11 @@ if [ -n \"\$NEWEST\" ] && [ -n \"\$BASELINE\" ]; then CURRENT=\$(find \$BUILDS/\$NEWEST/logs -type f 2>/dev/null | wc -l) PCT=\$((CURRENT * 100 / BASELINE)) echo \"Rev \$NEWEST: \$CURRENT / \$BASELINE log files (\$PCT%)\" -fi'" +fi +echo "" +echo "Disk:" +df --output=target,used,avail,pcent / /extra/ 2>/dev/null +echo "Builds: \$(ls \$BUILDS | wc -l) in /opt/plt, \$(ls /extra/builds 2>/dev/null | wc -l) in /extra"'" tmux split-window -v -t "$SESSION:status" \ "watch -n 5 'systemctl status drdr-render --no-pager -n0 2>&1'"