From 474d942cbbe1bcffd6c47d7245b4510f6b7c51c5 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Mon, 23 Dec 2019 19:28:13 +0000 Subject: [PATCH] Better handle errors within process-load-new-guix-revision-job --- guix-data-service/jobs/load-new-guix-revision.scm | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/guix-data-service/jobs/load-new-guix-revision.scm b/guix-data-service/jobs/load-new-guix-revision.scm index 81b385a..1c58f21 100644 --- a/guix-data-service/jobs/load-new-guix-revision.scm +++ b/guix-data-service/jobs/load-new-guix-revision.scm @@ -1268,7 +1268,17 @@ SKIP LOCKED") (let ((result (parameterize ((current-build-output-port logging-port) (real-error-port previous-error-port)) - (load-new-guix-revision conn git-repository-id commit)))) + (catch #t + (lambda () + (load-new-guix-revision conn + git-repository-id + commit)) + (lambda (key . args) + (simple-format + (current-error-port) + "error: load-new-guix-revision: ~A ~A\n" + key args) + #f))))) (combine-log-parts! logging-conn id) ;; This can happen with GC, so do it explicitly