branch: master
commit 2eb3e13580418fd29d8bfecf222a8392b2957a87
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Oct 25 18:29:21 2023 +0200
remote-worker: Discard log anytime ‘send-log’ throws.
* src/cuirass/scripts/remote-worker.scm (run-build): Discard build logs
when ‘send-log’ throws, no matter which exception is thrown. Improve
logging.
---
src/cuirass/scripts/remote-worker.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/cuirass/scripts/remote-worker.scm
b/src/cuirass/scripts/remote-worker.scm
index 2c9f569..d22b6df 100644
--- a/src/cuirass/scripts/remote-worker.scm
+++ b/src/cuirass/scripts/remote-worker.scm
@@ -236,12 +236,12 @@ still be substituted."
(reply (build-failed-message drv local-publish-url))))
(let-values (((port finish)
(build-derivations& store (list drv))))
- (catch 'system-error
+ (catch #t
(lambda ()
(send-log address log-port drv port))
(lambda args
- (log-error (G_ "could not send logs to ~a:~a")
- address log-port)
+ (log-error (G_ "could not send ~a log to ~a:~a; discarding it")
+ drv address log-port)
(dump-port port (%make-void-port "w"))))
(close-port port)
(finish)
