[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45409] [PATCH v4 07/13] substitute: Stop using call-with-cached-con
From: |
Christopher Baines |
Subject: |
[bug#45409] [PATCH v4 07/13] substitute: Stop using call-with-cached-connection in fetch-narinfos. |
Date: |
Sat, 16 Jan 2021 13:57:57 +0000 |
Instead, just pass open-connection-for-uri/maybe to http-multiple-get. This
code should be functionaly similar to the previous code. The eventual aim of
this is to make the connection caching not mandatory in fetch-narinfos.
* guix/scripts/substitute.scm (fetch-narinfos): Remove use of
call-with-cached-connection.
---
guix/scripts/substitute.scm | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 259b109cc6..88219ea7f6 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -412,20 +412,14 @@ port to it, or, if connection failed, print a warning and
return #f. Pass
;; on the X.509 PKI. We can do it because we authenticate
;; narinfos, which provides a much stronger guarantee.
(let* ((requests (map (cut narinfo-request url <>) paths))
- (result (call-with-cached-connection uri
- (lambda (port)
- (if port
- (begin
- (update-progress!)
- (http-multiple-get uri
- handle-narinfo-response
'()
- requests
- #:open-connection
-
open-connection-for-uri/cached
- #:verify-certificate? #f
- #:port port))
- '()))
- open-connection-for-uri/maybe)))
+ (result (begin
+ (update-progress!)
+ (http-multiple-get uri
+ handle-narinfo-response '()
+ requests
+ #:open-connection
+ open-connection-for-uri/maybe
+ #:verify-certificate? #f))))
result))
((file #f)
(let* ((base (string-append (uri-path uri) "/"))
--
2.30.0
- [bug#45409] [PATCH v4 01/13] substitute: Remove buffer handling from fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 02/13] substitute: Remove connection handling from fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 04/13] guix: Move http-multiple-get to (guix http-client)., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 11/13] substitute: Remove redundant fetch arguments., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 05/13] http-client: Add error handling to http-multiple-get., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 06/13] substitute: open-connection-for-uri/maybe add #:verify-certificate?., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 07/13] substitute: Stop using call-with-cached-connection in fetch-narinfos.,
Christopher Baines <=
- [bug#45409] [PATCH v4 03/13] substitute: Remove redundant let block from fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 10/13] substitute: Remove now redundant connection caching helpers., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 12/13] substitute: Inline fetch in to process-substitutes., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 08/13] http-client: Accept #:open-connection in http-fetch., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 13/13] substitute: Remove fetch-narinfos use open-connection-for-uri/maybe., Christopher Baines, 2021/01/16
- [bug#45409] [PATCH v4 09/13] substitute: Change connection cache handling in process-substitution., Christopher Baines, 2021/01/16