ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 11:39:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

publish: Catch all compression errors.

Browse source 
* guix/scripts/publish.scm (swallow-zlib-error): Remove.
(exception-with-kind-and-args?): New variable.
(swallow-compression-error): New macro.
(http-write): Use it instead of ‘swallow-zlib-error’.

Change-Id: I835a1eddd9686741d48365ed37f82b1e1d6f6bdd
This commit is contained in:
Ludovic Courtès 2024-04-28 23:19:40 +02:00
parent 7cef6b7ba5
commit f7f31c8595
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
guix/scripts/publish.scm
View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 David Thompson <davet@gnu.org>
;;; Copyright © 2020 by Amar M. Singh <nly@disroot.org>
;;; Copyright © 2015-2022 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015-2022, 2024 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2021, 2022 Mathieu Othacehe <othacehe@gnu.org>
@ -869,12 +869,23 @@ (define-syntax-rule (swallow-EPIPE exp ...)
(values)
(apply throw args)))))
(define-syntax-rule (swallow-zlib-error exp ...)
"Swallow 'zlib-error' exceptions raised by EXP..."
(catch 'zlib-error
(define exception-with-kind-and-args?
(exception-predicate &exception-with-kind-and-args))
(define-syntax-rule (swallow-compression-error exp ...)
"Swallow 'zlib-error', 'zstd-error', and 'lzlib-error' exceptions raised by
EXP..."
(with-exception-handler (lambda (exception)
(if (and (exception-with-kind-and-args? exception)
(memq (exception-kind exception)
'(zlib-error
zstd-error
lzlib-error)))
#f
(raise-exception exception)))
(lambda ()
exp ...)
(const #f)))
#:unwind? #t))
(define (nar-compressed-port port compression)
"Return a port on which to write the body of the response of a /nar request,
@ -972,10 +983,10 @@ (define compression
;; the only way to avoid building the whole nar in memory, which
;; could quickly become a real problem. As a bonus, we even do
;; sendfile(2) directly from the store files to the socket.
(swallow-zlib-error
(swallow-compression-error
(swallow-EPIPE
(write-file (utf8->string body) port)))
(swallow-zlib-error
(swallow-compression-error
(close-port port)
(unless keep-alive?
(close-port client)))