aboutsummaryrefslogtreecommitdiff
path: root/guix-build-coordinator
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2020-05-24 19:46:54 +0100
committerChristopher Baines <mail@cbaines.net>2020-05-24 19:46:54 +0100
commitb2b9f2c9092138757f45b582179c7890c1f564a2 (patch)
tree2db723fa5dbc8385139819fa95165e24e3cd966a /guix-build-coordinator
parent74dd7020af46853c8cf3aebb8548c4a6931f1210 (diff)
downloadbuild-coordinator-b2b9f2c9092138757f45b582179c7890c1f564a2.tar
build-coordinator-b2b9f2c9092138757f45b582179c7890c1f564a2.tar.gz
Improve the job processing output
Prefix more output with the build id, which helps when multiple builds are happening in parallel.
Diffstat (limited to 'guix-build-coordinator')
-rw-r--r--guix-build-coordinator/agent.scm32
1 files changed, 14 insertions, 18 deletions
diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm
index 19ea7c8..84be0ca 100644
--- a/guix-build-coordinator/agent.scm
+++ b/guix-build-coordinator/agent.scm
@@ -48,19 +48,18 @@
received-builds))
(define (process-job build)
- (simple-format #t "processing build: ~A\n"
- (assoc-ref build "uuid"))
- (let ((derivation-name (assoc-ref build "derivation-name")))
- (simple-format #t "setting up to build: ~A\n"
- derivation-name)
+ (let ((build-id (assoc-ref build "uuid"))
+ (derivation-name (assoc-ref build "derivation-name")))
+ (simple-format #t "~A: setting up to build: ~A\n"
+ build-id derivation-name)
(let ((pre-build-status (pre-build-process
derivation-substitute-urls
non-derivation-substitute-urls
derivation-name)))
(if (eq? (assq-ref pre-build-status 'result) 'success)
(begin
- (simple-format #t "setup successful, building: ~A\n"
- derivation-name)
+ (simple-format #t "~A: setup successful, building: ~A\n"
+ build-id derivation-name)
(let ((result (perform-build derivation-name)))
(retry-on-error
(lambda ()
@@ -68,17 +67,14 @@
(unless log-file
(raise-exception
(make-exception-with-message
- (simple-format
- #f
- "log file missing for ~A (~A)"
- derivation-name
- (assoc-ref build "uuid")))))
+ (simple-format #f "log file missing for ~A (~A)"
+ derivation-name build-id))))
- (simple-format #t "uploading log file ~A\n"
- log-file)
+ (simple-format #t "~A: uploading log file ~A\n"
+ build-id log-file)
(submit-log-file
coordinator-uri uuid password
- (assoc-ref build "uuid")
+ build-id
log-file)))
#:times 6
#:delay 30)
@@ -86,12 +82,12 @@
post-build-success
post-build-failure)
uuid coordinator-uri password
- (assoc-ref build "uuid")
+ build-id
derivation-name)))
(begin
- (simple-format #t "failure: ~A\n" pre-build-status)
+ (simple-format #t "~A: failure: ~A\n" build-id pre-build-status)
(report-setup-failure coordinator-uri uuid password
- (assoc-ref build "uuid")
+ build-id
pre-build-status))))))
(let-values (((process-job-with-queue count-jobs)