From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UK/ND7jxAmDIKgAA0tVLHw (envelope-from ) for ; Sat, 16 Jan 2021 14:01:28 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iD6cC7jxAmA1QwAA1q6Kng (envelope-from ) for ; Sat, 16 Jan 2021 14:01:28 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DECAA9404D0 for ; Sat, 16 Jan 2021 14:01:27 +0000 (UTC) Received: from localhost ([::1]:35274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l0m8s-0000BI-QY for larch@yhetil.org; Sat, 16 Jan 2021 09:01:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l0m6e-0007D7-9X for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:59305) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l0m6b-0004w0-SJ 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-0005xL-Rp for guix-patches@gnu.org; Sat, 16 Jan 2021 08:59:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45409] [PATCH v4 10/13] substitute: Remove now redundant connection caching helpers. 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.161080550422759 (code B ref 45409); Sat, 16 Jan 2021 13:59:05 +0000 Received: (at 45409) by debbugs.gnu.org; 16 Jan 2021 13:58:24 +0000 Received: from localhost ([127.0.0.1]:42603 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5v-0005uv-HF for submit@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:23 -0500 Received: from mira.cbaines.net ([212.71.252.8]:49434) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l0m5i-0005sq-4D for 45409@debbugs.gnu.org; Sat, 16 Jan 2021 08:58:11 -0500 Received: from localhost (188.29.101.63.threembb.co.uk [188.29.101.63]) by mira.cbaines.net (Postfix) with ESMTPSA id CA43F27BC1C 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 113d4c3d for <45409@debbugs.gnu.org>; Sat, 16 Jan 2021 13:58:03 +0000 (UTC) From: Christopher Baines Date: Sat, 16 Jan 2021 13:58:00 +0000 Message-Id: <20210116135803.21955-10-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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 2.65 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: DECAA9404D0 X-Spam-Score: 2.65 X-Migadu-Scanner: scn0.migadu.com X-TUID: y69hb6BLnm8P Failures now should be handled where they occur, and if there's a problem that's symptomatic of an issue with the connection, the port should be closed. * guix/scripts/substitute.scm (call-with-cached-connection): Remove procedure. (with-cached-connection): Remove syntax rule. --- guix/scripts/substitute.scm | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm index fc5a19124e..d316bdef15 100755 --- a/guix/scripts/substitute.scm +++ b/guix/scripts/substitute.scm @@ -689,32 +689,6 @@ server certificates." (drain-input socket) socket)))))))) -(define* (call-with-cached-connection uri proc - #:optional - (open-connection - open-connection-for-uri/cached)) - (let ((port (open-connection uri))) - (catch #t - (lambda () - (proc port)) - (lambda (key . args) - ;; If PORT was cached and the server closed the connection in the - ;; meantime, we get EPIPE. In that case, open a fresh connection and - ;; retry. We might also get 'bad-response or a similar exception from - ;; (web response) later on, once we've sent the request, or a - ;; ERROR/INVALID-SESSION from GnuTLS. - (if (or (and (eq? key 'system-error) - (= EPIPE (system-error-errno `(,key ,@args)))) - (and (eq? key 'gnutls-error) - (eq? (first args) error/invalid-session)) - (memq key '(bad-response bad-header bad-header-component))) - (proc (open-connection uri #:fresh? #t)) - (apply throw key args)))))) - -(define-syntax-rule (with-cached-connection uri port exp ...) - "Bind PORT with EXP... to a socket connected to URI." - (call-with-cached-connection uri (lambda (port) exp ...))) - (define* (process-substitution store-item destination #:key cache-urls acl deduplicate? print-build-trace?) @@ -1010,8 +984,6 @@ default value." ;;; Local Variables: ;;; eval: (put 'with-timeout 'scheme-indent-function 1) -;;; eval: (put 'with-cached-connection 'scheme-indent-function 2) -;;; eval: (put 'call-with-cached-connection 'scheme-indent-function 1) ;;; End: ;;; substitute.scm ends here -- 2.30.0