From patchwork Sat Jan 16 13:57:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 26414 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F02227BC14; Sat, 16 Jan 2021 14:03:34 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E57CC27BC13 for ; Sat, 16 Jan 2021 14:03:31 +0000 (GMT) Received: from localhost ([::1]:38552 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0mAt-0001cI-5P for patchwork@mira.cbaines.net; Sat, 16 Jan 2021 09:03:31 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0m6e-0007D4-9X for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59304) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0m6b-0004vz-D3 for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l0m6b-0005xE-CC for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v4 09/13] substitute: Change connection cache handling in process-substitution. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Jan 2021 13:59:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45409 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 45409@debbugs.gnu.org Received: via spool by 45409-submit@debbugs.gnu.org id=B45409.161080550322752 (code B ref 45409); Sat, 16 Jan 2021 13:59:05 +0000 Received: (at 45409) by debbugs.gnu.org; 16 Jan 2021 13:58:23 +0000 Received: from localhost ([127.0.0.1]:42601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5v-0005uo-8d for submit@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:23 -0500 Received: from mira.cbaines.net ([212.71.252.8]:49432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5h-0005sj-TR for 45409@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:10 -0500 Received: from localhost (188.29.101.63.threembb.co.uk [188.29.101.63]) by mira.cbaines.net (Postfix) with ESMTPSA id B3DDA27BC1B for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:07 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 41331557 for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:03 +0000 (UTC) From: Christopher Baines Date: Sat, 16 Jan 2021 13:57:59 +0000 Message-Id: <20210116135803.21955-9-mail@cbaines.net> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210116135803.21955-1-mail@cbaines.net> References: <20210116135803.21955-1-mail@cbaines.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Just pass open-connection-for-uri/maybe to http-fetch, this removes the need for with-cached-connection and passing the port in. * guix/scripts/substitute.scm (fetch): Don't take a port as an argument, and pass open-connection-for-uri/maybe to http-fetch. (process-substitution): Don't call fetch with with-cached-connection. --- guix/scripts/substitute.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index 88219ea7f6..fc5a19124e 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -170,7 +170,7 @@ again." (apply values result))))) (define* (fetch uri #:key (buffered? #t) (timeout? #t) - (keep-alive? #f) (port #f)) + (keep-alive? #f)) "Return a binary input port to URI and the number of bytes it's expected to provide. @@ -199,7 +199,8 @@ connection (typically PORT) is kept open once data has been fetched from URI." (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 #:port port + (http-fetch uri #:text? #f + #:open-connection open-connection-for-uri/maybe #:keep-alive? keep-alive? #:buffered? buffered? #:verify-certificate? #f)))) @@ -751,10 +752,8 @@ the current output port." (let*-values (((raw download-size) ;; 'guix publish' without '--cache' doesn't specify a ;; Content-Length, so DOWNLOAD-SIZE is #f in this case. - (with-cached-connection uri port - (fetch uri #:buffered? #f #:timeout? #f - #:port port - #:keep-alive? #t))) + (fetch uri #:buffered? #f #:timeout? #f + #:keep-alive? #t)) ((progress) (let* ((dl-size (or download-size (and (equal? compression "none")