futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

services: guix-build-coordinator: Remove duplicate log timestamp.

Browse Source 
* gnu/services/guix.scm (guix-build-coordinator-shepherd-services,
guix-build-coordinator-agent-shepherd-services,
guix-build-coordinator-queue-builds-shepherd-services): Set
%current-logfile-date-format to "".

Signed-off-by: Christopher Baines <mail@cbaines.net>
This commit is contained in:
Christopher Baines 2022-11-10 14:02:00 +00:00
parent b8fd2877c9
commit dafab37110
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 130 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
gnu/services/guix.scm
View File

@ -333,31 +333,38 @@
(documentation "Guix Build Coordinator") (documentation "Guix Build Coordinator")
(provision '(guix-build-coordinator)) (provision '(guix-build-coordinator))
(requirement '(networking)) (requirement '(networking))
(start #~(make-forkexec-constructor (start #~(lambda args
(list #$(make-guix-build-coordinator-start-script (parameterize ((%current-logfile-date-format ""))
database-uri-string (apply
allocation-strategy make-forkexec-constructor
"/var/run/guix-build-coordinator/pid" (list #$(make-guix-build-coordinator-start-script
package database-uri-string
#:agent-communication-uri-string allocation-strategy
agent-communication-uri-string "/var/run/guix-build-coordinator/pid"
#:client-communication-uri-string package
client-communication-uri-string #:agent-communication-uri-string
#:hooks hooks agent-communication-uri-string
#:parallel-hooks parallel-hooks #:client-communication-uri-string
#:guile guile)) client-communication-uri-string
#:user #$user #:hooks hooks
#:group #$group #:parallel-hooks parallel-hooks
#:pid-file "/var/run/guix-build-coordinator/pid" #:guile guile))
;; Allow time for migrations to run #:user #$user
#:pid-file-timeout 60 #:group #$group
#:environment-variables #:pid-file "/var/run/guix-build-coordinator/pid"
`(,(string-append ;; Allow time for migrations to run
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") #:pid-file-timeout 60
"LC_ALL=en_US.utf8" #:environment-variables
"PATH=/run/current-system/profile/bin") ; for hooks `(,(string-append
#:log-file "/var/log/guix-build-coordinator/coordinator.log")) "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
(stop #~(make-kill-destructor)))))) "LC_ALL=en_US.utf8"
"PATH=/run/current-system/profile/bin") ; for hooks
#:log-file "/var/log/guix-build-coordinator/coordinator.log"
args))))
(stop #~(make-kill-destructor))
(modules
`((shepherd comm)
,@%default-modules))))))
(define (guix-build-coordinator-activation config) (define (guix-build-coordinator-activation config)
#~(begin #~(begin
@ -419,61 +426,67 @@
(documentation "Guix Build Coordinator Agent") (documentation "Guix Build Coordinator Agent")
(provision '(guix-build-coordinator-agent)) (provision '(guix-build-coordinator-agent))
(requirement '(networking)) (requirement '(networking))
(start #~(make-forkexec-constructor (start
(list #$(file-append package "/bin/guix-build-coordinator-agent") #~(lambda _
#$(string-append "--coordinator=" coordinator) (parameterize ((%current-logfile-date-format ""))
#$@(match authentication (fork+exec-command
(($ <guix-build-coordinator-agent-password-auth> (list #$(file-append package "/bin/guix-build-coordinator-agent")
uuid password) #$(string-append "--coordinator=" coordinator)
#~(#$(string-append "--uuid=" uuid) #$@(match authentication
#$(string-append "--password=" password))) (($ <guix-build-coordinator-agent-password-auth>
(($ <guix-build-coordinator-agent-password-file-auth> uuid password)
uuid password-file) #~(#$(string-append "--uuid=" uuid)
#~(#$(string-append "--uuid=" uuid) #$(string-append "--password=" password)))
#$(string-append "--password-file=" (($ <guix-build-coordinator-agent-password-file-auth>
password-file))) uuid password-file)
(($ <guix-build-coordinator-agent-dynamic-auth> #~(#$(string-append "--uuid=" uuid)
agent-name token) #$(string-append "--password-file="
#~(#$(string-append "--name=" agent-name) password-file)))
#$(string-append "--dynamic-auth-token=" token))) (($ <guix-build-coordinator-agent-dynamic-auth>
(($ agent-name token)
<guix-build-coordinator-agent-dynamic-auth-with-file> #~(#$(string-append "--name=" agent-name)
agent-name token-file) #$(string-append "--dynamic-auth-token=" token)))
#~(#$(string-append "--name=" agent-name) (($
#$(string-append "--dynamic-auth-token-file=" <guix-build-coordinator-agent-dynamic-auth-with-file>
token-file)))) agent-name token-file)
#$(simple-format #f "--max-parallel-builds=~A" #~(#$(string-append "--name=" agent-name)
max-parallel-builds) #$(string-append "--dynamic-auth-token-file="
#$@(if max-allocated-builds token-file))))
#~(#$(simple-format #f "--max-allocated-builds=~A" #$(simple-format #f "--max-parallel-builds=~A"
max-allocated-builds)) max-parallel-builds)
#~()) #$@(if max-allocated-builds
#$@(if max-1min-load-average #~(#$(simple-format #f "--max-allocated-builds=~A"
#~(#$(simple-format #f "--max-1min-load-average=~A" max-allocated-builds))
max-1min-load-average)) #~())
#~()) #$@(if max-1min-load-average
#$@(if derivation-substitute-urls #~(#$(simple-format #f "--max-1min-load-average=~A"
#~(#$(string-append max-1min-load-average))
"--derivation-substitute-urls=" #~())
#$@(if derivation-substitute-urls
#~(#$(string-append
"--derivation-substitute-urls="
(string-join derivation-substitute-urls " "))) (string-join derivation-substitute-urls " ")))
#~()) #~())
#$@(if non-derivation-substitute-urls #$@(if non-derivation-substitute-urls
#~(#$(string-append #~(#$(string-append
"--non-derivation-substitute-urls=" "--non-derivation-substitute-urls="
(string-join non-derivation-substitute-urls " "))) (string-join non-derivation-substitute-urls " ")))
#~()) #~())
#$@(map (lambda (system) #$@(map (lambda (system)
(string-append "--system=" system)) (string-append "--system=" system))
(or systems '()))) (or systems '())))
#:user #$user #:user #$user
#:environment-variables #:environment-variables
`(,(string-append `(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
;; XDG_CACHE_HOME is used by Guix when caching narinfo files ;; XDG_CACHE_HOME is used by Guix when caching narinfo files
"XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent" "XDG_CACHE_HOME=/var/cache/guix-build-coordinator-agent"
"LC_ALL=en_US.utf8") "LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/agent.log")) #:log-file "/var/log/guix-build-coordinator/agent.log"))))
(stop #~(make-kill-destructor)))))) (stop #~(make-kill-destructor))
(modules
`((shepherd comm)
,@%default-modules))))))
(define (guix-build-coordinator-agent-activation config) (define (guix-build-coordinator-agent-activation config)
#~(begin #~(begin
@ -526,39 +539,44 @@
(provision '(guix-build-coordinator-queue-builds)) (provision '(guix-build-coordinator-queue-builds))
(requirement '(networking)) (requirement '(networking))
(start (start
#~(make-forkexec-constructor #~(lambda _
(list (parameterize ((%current-logfile-date-format ""))
#$(file-append (fork+exec-command
package (list
"/bin/guix-build-coordinator-queue-builds-from-guix-data-service") #$(file-append
#$(string-append "--coordinator=" coordinator) package
#$@(map (lambda (system) "/bin/guix-build-coordinator-queue-builds-from-guix-data-service")
(string-append "--system=" system)) #$(string-append "--coordinator=" coordinator)
(or systems '())) #$@(map (lambda (system)
#$@(map (match-lambda (string-append "--system=" system))
((system . target) (or systems '()))
(string-append "--system-and-target=" system "=" target))) #$@(map (match-lambda
(or systems-and-targets '())) ((system . target)
#$@(if guix-data-service (string-append "--system-and-target=" system "=" target)))
#~(#$(string-append "--guix-data-service=" guix-data-service)) (or systems-and-targets '()))
#~()) #$@(if guix-data-service
#$@(if guix-data-service-build-server-id #~(#$(string-append "--guix-data-service=" guix-data-service))
#~(#$(simple-format #~())
#f #$@(if guix-data-service-build-server-id
"--guix-data-service-build-server-id=~A" #~(#$(simple-format
guix-data-service-build-server-id)) #f
#~()) "--guix-data-service-build-server-id=~A"
#$@(if processed-commits-file guix-data-service-build-server-id))
#~(#$(string-append "--processed-commits-file=" #~())
processed-commits-file)) #$@(if processed-commits-file
#~())) #~(#$(string-append "--processed-commits-file="
#:user #$user processed-commits-file))
#:environment-variables #~()))
`(,(string-append #:user #$user
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") #:environment-variables
"LC_ALL=en_US.utf8") `(,(string-append
#:log-file "/var/log/guix-build-coordinator/queue-builds.log")) "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
(stop #~(make-kill-destructor)))))) "LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/queue-builds.log"))))
(stop #~(make-kill-destructor))
(modules
`((shepherd comm)
,@%default-modules))))))
(define (guix-build-coordinator-queue-builds-activation config) (define (guix-build-coordinator-queue-builds-activation config)
#~(begin #~(begin