Improve handling of build failures

1 files changed, 11 insertions, 8 deletions

diff --git a/guix-build-coordinator/agent.scm b/guix-build-coordinator/agent.scm
index acb1572..b5180e2 100644
--- a/guix-build-coordinator/agent.scm
+++ b/guix-build-coordinator/agent.scm
@@ -90,7 +90,7 @@
                          derivation-name)
                 (report-build-start coordinator-uri uuid password
                                     build-id)
-                (let* ((result (perform-build lgr store derivation-name))
+                (let* ((result (perform-build lgr store build-id derivation-name))
                        ;; TODO Check this handles timezones right
                        (end-time (localtime (current-time) "UTC")))
 
@@ -351,20 +351,23 @@ but the guix-daemon claims it's unavailable")
         '((result         . failure)
           (failure_reason . error_fetching_derivation)))))
 
-(define (perform-build lgr store derivation-name)
+(define (perform-build lgr store build-id derivation-name)
   (set-build-options store
                      #:use-substitutes? #f)
 
   (parameterize ((current-build-output-port (%make-void-port "w")))
-    (catch #t
+    (with-exception-handler
+        (lambda (exn)
+          (if (and (store-protocol-error? exn)
+                   (eq? (store-protocol-error-status exn)
+                        100))
+              (log-msg lgr 'INFO build-id ": build failed")
+              (log-msg lgr 'ERROR build-id ": unknown exception " exn))
+          #f)
       (lambda ()
         (build-things store (list derivation-name))
         #t)
-      (lambda (key . args)
-        (log-msg lgr 'ERROR
-                 "build: " key " " args)
-
-        #f))))
+      #:unwind? #t)))
 
 (define (post-build-failure lgr uuid coordinator-uri password
                             build-id derivation end-time)