From 9fd8aabc11e396c604d360eea44b5f38ca60813a Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 17 Mar 2024 09:51:02 +0000 Subject: Make some module tweaks --- guix-qa-frontpage/database.scm | 9 +++++++-- guix-qa-frontpage/guix-data-service.scm | 2 +- guix-qa-frontpage/manage-builds.scm | 3 ++- guix-qa-frontpage/mumi.scm | 2 +- guix-qa-frontpage/patchwork.scm | 5 ++++- guix-qa-frontpage/server.scm | 2 +- 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/guix-qa-frontpage/database.scm b/guix-qa-frontpage/database.scm index af2da53..5649c36 100644 --- a/guix-qa-frontpage/database.scm +++ b/guix-qa-frontpage/database.scm @@ -30,8 +30,13 @@ #:use-module (prometheus) #:use-module (guix narinfo) #:use-module (guix derivations) - #:use-module (guix-build-coordinator utils) - #:use-module (guix-build-coordinator utils fibers) + #:use-module ((guix-build-coordinator utils) + #:select (log-delay + call-with-delay-logging)) + #:use-module ((guix-build-coordinator utils fibers) + #:select (retry-on-error + make-worker-thread-channel + call-with-worker-thread)) #:use-module (guix-qa-frontpage guix-data-service) #:export (setup-database diff --git a/guix-qa-frontpage/guix-data-service.scm b/guix-qa-frontpage/guix-data-service.scm index 3565c27..9bf7997 100644 --- a/guix-qa-frontpage/guix-data-service.scm +++ b/guix-qa-frontpage/guix-data-service.scm @@ -10,7 +10,7 @@ #:use-module (rnrs bytevectors) #:use-module (zlib) #:use-module (json) - #:use-module ((guix-build-coordinator utils) #:select (retry-on-error)) + #:use-module ((guix-build-coordinator utils fibers) #:select (retry-on-error)) #:use-module (guix-qa-frontpage utils) #:use-module (guix-qa-frontpage patchwork) #:use-module (guix-qa-frontpage manage-patch-branches) diff --git a/guix-qa-frontpage/manage-builds.scm b/guix-qa-frontpage/manage-builds.scm index 173e72c..b8b0189 100644 --- a/guix-qa-frontpage/manage-builds.scm +++ b/guix-qa-frontpage/manage-builds.scm @@ -11,7 +11,8 @@ #:use-module (guix sets) #:use-module ((guix build syscalls) #:select (set-thread-name)) - #:use-module (guix-build-coordinator utils) + #:use-module ((guix-build-coordinator utils fibers) + #:select (retry-on-error)) #:use-module (guix-build-coordinator client-communication) #:use-module (guix-qa-frontpage utils) #:use-module (guix-qa-frontpage database) diff --git a/guix-qa-frontpage/mumi.scm b/guix-qa-frontpage/mumi.scm index 540f909..6baa199 100644 --- a/guix-qa-frontpage/mumi.scm +++ b/guix-qa-frontpage/mumi.scm @@ -25,7 +25,7 @@ #:use-module (web uri) #:use-module (web client) #:use-module ((guix-data-service utils) #:select (chunk!)) - #:use-module ((guix-build-coordinator utils) + #:use-module ((guix-build-coordinator utils fibers) #:select (retry-on-error)) #:export (mumi-search-issues diff --git a/guix-qa-frontpage/patchwork.scm b/guix-qa-frontpage/patchwork.scm index afcc47c..2efef03 100644 --- a/guix-qa-frontpage/patchwork.scm +++ b/guix-qa-frontpage/patchwork.scm @@ -11,7 +11,10 @@ #:use-module (web client) #:use-module (web request) #:use-module (web response) - #:use-module (guix-build-coordinator utils) + #:use-module ((guix-build-coordinator utils) + #:select (call-with-delay-logging)) + #:use-module ((guix-build-coordinator utils fibers) + #:select (retry-on-error)) #:use-module (guix-qa-frontpage mumi) #:use-module (guix-qa-frontpage debbugs) #:export (%patchwork-instance diff --git a/guix-qa-frontpage/server.scm b/guix-qa-frontpage/server.scm index b175b0e..ab0680a 100644 --- a/guix-qa-frontpage/server.scm +++ b/guix-qa-frontpage/server.scm @@ -39,7 +39,7 @@ #:use-module ((guix-data-service web query-parameters) #:select (parse-query-string)) #:use-module ((guix-build-coordinator utils) - #:select (with-time-logging get-gc-metrics-updater + #:select (with-time-logging get-port-metrics-updater call-with-delay-logging)) #:use-module ((guix-build-coordinator utils fibers) -- cgit v1.2.3