Fix the pool metrics

This commit is contained in:
Christopher Baines 2024-07-29 11:24:24 +01:00
parent f0f1329461
commit d8ade0ea11

View file

@ -101,7 +101,6 @@
(%guix-data-service-metrics-registry registry) (%guix-data-service-metrics-registry registry)
(let ((finished? (make-condition)) (let ((finished? (make-condition))
(render-metrics (make-render-metrics registry))
(request-scheduler #f)) (request-scheduler #f))
(call-with-sigint (call-with-sigint
(lambda () (lambda ()
@ -218,27 +217,28 @@ port. Also, the port used can be changed by passing the --port option.\n"
conn))) conn)))
request-scheduler) request-scheduler)
(run-server/patched (let ((render-metrics (make-render-metrics registry)))
(lambda (request body) (run-server/patched
(metric-increment requests-metric) (lambda (request body)
(metric-increment requests-metric)
(let ((reply (make-channel))) (let ((reply (make-channel)))
(spawn-fiber (spawn-fiber
(lambda () (lambda ()
(call-with-values (call-with-values
(lambda () (lambda ()
(handler request finished? body controller (handler request finished? body controller
secret-key-base secret-key-base
startup-completed startup-completed
render-metrics)) render-metrics))
(lambda vals (lambda vals
(put-message reply vals)))) (put-message reply vals))))
request-scheduler request-scheduler
#:parallel? #t) #:parallel? #t)
(apply values (get-message reply)))) (apply values (get-message reply))))
#:host host #:host host
#:port port)) #:port port)))
#:unwind? #t))) #:unwind? #t)))
;; Guile sometimes just seems to stop listening on the port, so try ;; Guile sometimes just seems to stop listening on the port, so try