Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions config.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
13 changes: 12 additions & 1 deletion dirstruct.rkt
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -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?)]
Expand Down
6 changes: 5 additions & 1 deletion scripts/monitor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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'"

Expand Down
Loading