From 8116cc66733134a8fb6f9117d4648288b83c8356 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Thu, 7 Jan 2021 20:41:50 +0000 Subject: substitute: Inline fetch in to process-substitutes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As it's only called in one place, and this should make the code easier to read. * guix/scripts/substitute.scm (fetch): Move procedure inside… (process-substitution): …here. --- guix/scripts/substitute.scm | 60 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 26fd05429f..717c232633 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -169,37 +169,6 @@ again." (sigaction SIGALRM SIG_DFL) (apply values result))))) -(define (fetch uri) - "Return a binary input port to URI and the number of bytes it's expected to -provide." - (case (uri-scheme uri) - ((file) - (let ((port (open-file (uri-path uri) "r0b"))) - (values port (stat:size (stat port))))) - ((http https) - (guard (c ((http-get-error? c) - (leave (G_ "download from '~a' failed: ~a, ~s~%") - (uri->string (http-get-error-uri c)) - (http-get-error-code c) - (http-get-error-reason c)))) - ;; Test this with: - ;; sudo tc qdisc add dev eth0 root netem delay 1500ms - ;; and then cancel with: - ;; sudo tc qdisc del dev eth0 root - (with-timeout %fetch-timeout - (begin - (warning (G_ "while fetching ~a: server is somewhat slow~%") - (uri->string uri)) - (warning (G_ "try `--no-substitutes' if the problem persists~%"))) - (http-fetch uri #:text? #f - #:open-connection open-connection-for-uri/maybe - #:keep-alive? #t - #:buffered? #f - #:verify-certificate? #f)))) - (else - (leave (G_ "unsupported substitute URI scheme: ~a~%") - (uri->string uri))))) - (define (narinfo-cache-file cache-url path) "Return the name of the local file that contains an entry for PATH. The entry is stored in a sub-directory specific to CACHE-URL." @@ -706,6 +675,35 @@ the current output port." (apply dump-file/deduplicate (append args (list #:store (%store-prefix))))) + (define (fetch uri) + (case (uri-scheme uri) + ((file) + (let ((port (open-file (uri-path uri) "r0b"))) + (values port (stat:size (stat port))))) + ((http https) + (guard (c ((http-get-error? c) + (leave (G_ "download from '~a' failed: ~a, ~s~%") + (uri->string (http-get-error-uri c)) + (http-get-error-code c) + (http-get-error-reason c)))) + ;; Test this with: + ;; sudo tc qdisc add dev eth0 root netem delay 1500ms + ;; and then cancel with: + ;; sudo tc qdisc del dev eth0 root + (with-timeout %fetch-timeout + (begin + (warning (G_ "while fetching ~a: server is somewhat slow~%") + (uri->string uri)) + (warning (G_ "try `--no-substitutes' if the problem persists~%"))) + (http-fetch uri #:text? #f + #:open-connection open-connection-for-uri/maybe + #:keep-alive? #t + #:buffered? #f + #:verify-certificate? #f)))) + (else + (leave (G_ "unsupported substitute URI scheme: ~a~%") + (uri->string uri))))) + (unless narinfo (leave (G_ "no valid substitute for '~a'~%") store-item)) -- cgit v1.2.3 ès 2023-12-17daemon: Fix my own whitespace errors....Tobias Geerinckx-Rice 2023-12-10daemon: Sacrifice builders on OOM....Tobias Geerinckx-Rice 2023-12-11daemon: Implement ‘substitute-urls’ RPC....Ludovic Courtès 2023-12-04daemon: Simplify “empty status” substitute error message....Ludovic Courtès 2023-09-24Revert "build: Add missing guix-gc.timer file to binary tarball."...Tobias Geerinckx-Rice 2023-09-26daemon: Add “git-download” built-in builder....Ludovic Courtès 2023-09-09daemon: Fix build with GCC 13....Sören Tempel 2023-08-31build: Add missing guix-gc.timer file to binary tarball....Maxim Cournoyer 2023-01-09daemon: Improve error message for wrong hash sizes....Ludovic Courtès 2022-12-18daemon: Make "opening file" error messages distinguishable....Ludovic Courtès 2022-10-17Revert "nix: Guard against removing temporary roots of living processes."...Ludovic Courtès 2022-10-07nix: Guard against removing temporary roots of living processes....Ludovic Courtès 2022-09-11daemon: Remove unused function findOutput....Maxime Devos 2022-09-11daemon: Remove unused function exportPaths....Maxime Devos 2022-09-11daemon: Remove unused function openStore....Maxime Devos 2022-06-05daemon: Quote consistently within a string....Tobias Geerinckx-Rice 2022-05-29daemon: Clarify ‘--check’ error when outputs are missing....Tobias Geerinckx-Rice 2022-05-18daemon: runChild() is forbidden to talk during environment set up...yarl-baudig@mailoo.org 2022-04-14daemon: Support systemd-style socket activation....Ludovic Courtès 2022-01-18daemon: Always default to gzip for log compression....Ludovic Courtès 2021-11-27daemon: Print the line whence we expect an integer....Tobias Geerinckx-Rice 2021-11-25daemon: Read substitute nar size as 'unsigned long long'....Ludovic Courtès 2021-11-25daemon: Read unsigned nar size and download size from substituter....Ludovic Courtès 2021-11-19daemon: Micro-optimize 'deletePath'....Ludovic Courtès 2021-11-16daemon: Do not deduplicate files smaller than 8 KiB....Ludovic Courtès 2021-10-01build: Don’t delete ‘guix-gc.timer’ file....Xinglu Chen 2021-09-20etc: Add systemd files for running ‘guix gc’ periodically...Thiago Jung Bauermann