diff options
| author | Christopher Baines <mail@cbaines.net> | 2025-02-04 13:19:01 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2025-02-06 17:14:47 +0000 |
| commit | 258ee0468b6bdfd4256b958c09a1014ad9bf6409 (patch) | |
| tree | 4f282e8f3315c3d113819ce4748475a625f9c131 /guix-data-service/web | |
| parent | 9bf4eea2fd6fd451598e6b5ac168515ada010276 (diff) | |
| download | data-service-258ee0468b6bdfd4256b958c09a1014ad9bf6409.tar data-service-258ee0468b6bdfd4256b958c09a1014ad9bf6409.tar.gz | |
Update use of resource pools
Diffstat (limited to 'guix-data-service/web')
| -rw-r--r-- | guix-data-service/web/build-server/controller.scm | 36 | ||||
| -rw-r--r-- | guix-data-service/web/controller.scm | 4 | ||||
| -rw-r--r-- | guix-data-service/web/server.scm | 5 |
3 files changed, 20 insertions, 25 deletions
diff --git a/guix-data-service/web/build-server/controller.scm b/guix-data-service/web/build-server/controller.scm index 7d2bd24..b0e38fe 100644 --- a/guix-data-service/web/build-server/controller.scm +++ b/guix-data-service/web/build-server/controller.scm @@ -125,25 +125,23 @@ (define (spawn-fiber-for-handler handler) (spawn-fiber (lambda () - (parameterize - ((resource-pool-retry-checkout-timeout (* 60 60 6))) - (call-with-resource-from-pool (background-connection-pool) - (lambda (conn) - (with-exception-handler - (lambda (exn) - (simple-format - (current-error-port) - "exception in build event handler: ~A\n" - exn)) - (lambda () - (with-throw-handler #t - (lambda () - (handler conn)) - (lambda _ - (display (backtrace) (current-error-port)) - (display "\n" (current-error-port))))) - #:unwind? #t)) - #:timeout #f))))) + (call-with-resource-from-pool (background-connection-pool) + (lambda (conn) + (with-exception-handler + (lambda (exn) + (simple-format + (current-error-port) + "exception in build event handler: ~A\n" + exn)) + (lambda () + (with-throw-handler #t + (lambda () + (handler conn)) + (lambda _ + (display (backtrace) (current-error-port)) + (display "\n" (current-error-port))))) + #:unwind? #t)) + #:timeout #f)))) (define (with-build-ids-for-status data build-ids diff --git a/guix-data-service/web/controller.scm b/guix-data-service/web/controller.scm index 274a76e..1c2c589 100644 --- a/guix-data-service/web/controller.scm +++ b/guix-data-service/web/controller.scm @@ -814,9 +814,7 @@ (('GET "builds") (delegate-to build-controller)) (('GET "metrics") - (parameterize - ((resource-pool-default-timeout 6)) - (render-metrics))) + (render-metrics)) (('GET "revision" args ...) (delegate-to revision-controller)) (('GET "repositories") diff --git a/guix-data-service/web/server.scm b/guix-data-service/web/server.scm index d6bd970..88f7b1a 100644 --- a/guix-data-service/web/server.scm +++ b/guix-data-service/web/server.scm @@ -210,9 +210,8 @@ port. Also, the port used can be changed by passing the --port option.\n" #:destructor (lambda (conn) (close-postgresql-connection conn "web-reserved")) - #:scheduler priority-scheduler)) - - (resource-pool-default-timeout 6)) + #:default-checkout-timeout 6 + #:scheduler priority-scheduler))) (let ((resource-pool-checkout-failures-metric (make-counter-metric registry |