branch master updated: Fix issues with with-resource-from-pool

[Christopher Baines]

This is an automated email from the git hooks/post-receive script.

cbaines pushed a commit to branch master
in repository data-service.

The following commit(s) were added to refs/heads/master by this push:
     new 1c75394  Fix issues with with-resource-from-pool
1c75394 is described below

commit 1c7539418743e0dfe3a9cad22c414fd732daef8f
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Wed Jul 26 10:11:00 2023 +0100

    Fix issues with with-resource-from-pool
---
 guix-data-service/web/repository/controller.scm | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/guix-data-service/web/repository/controller.scm 
b/guix-data-service/web/repository/controller.scm
index 375ea23..e1a9b9c 100644
--- a/guix-data-service/web/repository/controller.scm
+++ b/guix-data-service/web/repository/controller.scm
@@ -620,11 +620,11 @@
                                     package-derivations))))))
           (else
            (letpar& ((systems
-                      (with-resource-from-pool (connection-pool) conn
-                       list-systems))
+                      (call-with-resource-from-pool (connection-pool)
+                        list-systems))
                      (targets
-                      (with-resource-from-pool (connection-pool) conn
-                       valid-targets)))
+                      (call-with-resource-from-pool (connection-pool)
+                        valid-targets)))
              (render-html
               #:sxml (view-branch-package-derivations
                       parsed-query-parameters
@@ -667,9 +667,8 @@
                                           package-name
                                           output-name)))
            (build-server-urls
-            (call-with-resource-from-pool
-             (connection-pool)
-             select-build-server-urls-by-id)))
+            (call-with-resource-from-pool (connection-pool)
+              select-build-server-urls-by-id)))
         (case (most-appropriate-mime-type
                '(application/json text/html)
                mime-types)
@@ -696,11 +695,11 @@
                                     package-outputs))))))
           (else
            (letpar& ((systems
-                      (with-resource-from-pool (connection-pool) conn
-                       list-systems))
+                      (call-with-resource-from-pool (connection-pool)
+                        list-systems))
                      (targets
-                      (with-resource-from-pool (connection-pool) conn
-                       valid-targets)))
+                      (call-with-resource-from-pool (connection-pool)
+                        valid-targets)))
              (render-html
               #:sxml (view-branch-package-outputs
                       parsed-query-parameters