From 4f17609b377c128888be6d85af46fb05fe38ce45 Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Wed, 16 Sep 2020 20:46:54 +0100 Subject: Move more coordinator service startup out of the script --- scripts/guix-build-coordinator.in | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'scripts') diff --git a/scripts/guix-build-coordinator.in b/scripts/guix-build-coordinator.in index 8aed241..59341cc 100644 --- a/scripts/guix-build-coordinator.in +++ b/scripts/guix-build-coordinator.in @@ -420,14 +420,10 @@ processed?: ~A #:allocation-strategy (assq-ref opts 'allocation-strategy)))) - (when (assoc-ref opts 'update-database) - (datastore-update datastore)) - - (let ((pid-file (assq-ref opts 'pid-file))) - (when pid-file - (call-with-output-file pid-file - (lambda (port) - (simple-format port "~A\n" (getpid)))))) + (perform-coordinator-service-startup + build-coordinator + #:update-datastore? (assoc-ref opts 'update-database) + #:pid-file (assq-ref opts 'pid-file)) (parameterize ((%show-error-details (assoc-ref opts 'show-error-details))) @@ -443,9 +439,6 @@ processed?: ~A (make-worker-thread-channel (const '()) #:parallelism 2))) - (start-hook-processing-threads build-coordinator) - (trigger-build-allocation build-coordinator) - (let ((finished? (make-condition))) (call-with-sigint (lambda () -- cgit v1.2.3