01/02: Fix some uses of select-build-server-urls-by-id

[Christopher Baines]

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

commit 6e4d436d7548108f78d279658292f034d447a09e
Author: Christopher Baines <mail@cbaines.net>
AuthorDate: Thu Jul 20 16:12:00 2023 +0100

    Fix some uses of select-build-server-urls-by-id
---
 guix-data-service/web/compare/controller.scm  | 20 ++++++++++----------
 guix-data-service/web/revision/controller.scm |  8 ++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/guix-data-service/web/compare/controller.scm 
b/guix-data-service/web/compare/controller.scm
index 6380651..ebbf6df 100644
--- a/guix-data-service/web/compare/controller.scm
+++ b/guix-data-service/web/compare/controller.scm
@@ -703,8 +703,8 @@
                       #:after-name after-name
                       #:limit-results limit-results)))
                   (build-server-urls
-                   (with-resource-from-pool (connection-pool) conn
-                    select-build-server-urls-by-id)))
+                   (call-with-resource-from-pool (connection-pool)
+                     select-build-server-urls-by-id)))
           (let ((names-and-versions
                  (package-derivation-data->names-and-versions data)))
             (let-values
@@ -936,8 +936,8 @@
                     (with-resource-from-pool (connection-pool) conn
                      list-systems))
                    (build-server-urls
-                    (with-resource-from-pool (connection-pool) conn
-                     select-build-server-urls-by-id)))
+                    (call-with-resource-from-pool (connection-pool)
+                      select-build-server-urls-by-id)))
          (render-html
           #:sxml (compare/system-test-derivations
                   query-parameters
@@ -959,8 +959,8 @@
                       (commit->revision-id conn target-commit)
                       system)))
                   (build-server-urls
-                   (with-resource-from-pool (connection-pool) conn
-                    select-build-server-urls-by-id))
+                   (call-with-resource-from-pool (connection-pool)
+                     select-build-server-urls-by-id))
                   (base-git-repositories
                    (with-resource-from-pool (connection-pool) conn
                      (git-repositories-containing-commit conn base-commit)))
@@ -1006,8 +1006,8 @@
                     (with-resource-from-pool (connection-pool) conn
                      list-systems))
                    (build-server-urls
-                    (with-resource-from-pool (connection-pool) conn
-                     select-build-server-urls-by-id)))
+                    (call-with-resource-from-pool (connection-pool)
+                      select-build-server-urls-by-id)))
          (render-html
           #:sxml (compare/system-test-derivations
                   query-parameters
@@ -1042,8 +1042,8 @@
                         (first target-revision-details)
                         system)))
                     (build-server-urls
-                     (with-resource-from-pool (connection-pool) conn
-                      select-build-server-urls-by-id))
+                     (call-with-resource-from-pool (connection-pool)
+                       select-build-server-urls-by-id))
                     (base-git-repositories
                      (with-resource-from-pool (connection-pool) conn
                        (git-repositories-containing-commit
diff --git a/guix-data-service/web/revision/controller.scm 
b/guix-data-service/web/revision/controller.scm
index 9cfddd4..f55b0e0 100644
--- a/guix-data-service/web/revision/controller.scm
+++ b/guix-data-service/web/revision/controller.scm
@@ -1066,8 +1066,8 @@
                      #:after-name (assq-ref query-parameters 'after_name)
                      #:include-builds? (member "builds" fields)))))
              (build-server-urls
-              (with-resource-from-pool (connection-pool) conn
-               select-build-server-urls-by-id)))
+              (call-with-resource-from-pool (connection-pool)
+                select-build-server-urls-by-id)))
           (let ((show-next-page?
                  (if all-results
                      #f
@@ -1178,8 +1178,8 @@
                  #:after-derivation-file-name
                  (assq-ref query-parameters 'after_name))))
              (build-server-urls
-              (with-resource-from-pool (connection-pool) conn
-               select-build-server-urls-by-id)))
+              (call-with-resource-from-pool (connection-pool)
+                select-build-server-urls-by-id)))
           (let ((show-next-page?
                  (if all-results
                      #f