amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Download patch file Download diff file Expand all files Collapse all files

36
gnu/services/guix.scm
View file

@ -333,7 +333,10 @@
(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
(parameterize ((%current-logfile-date-format ""))
(apply
make-forkexec-constructor
(list #$(make-guix-build-coordinator-start-script (list #$(make-guix-build-coordinator-start-script
database-uri-string database-uri-string
allocation-strategy allocation-strategy
@ -356,8 +359,12 @@
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8" "LC_ALL=en_US.utf8"
"PATH=/run/current-system/profile/bin") ; for hooks "PATH=/run/current-system/profile/bin") ; for hooks
#:log-file "/var/log/guix-build-coordinator/coordinator.log")) #:log-file "/var/log/guix-build-coordinator/coordinator.log"
(stop #~(make-kill-destructor)))))) 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,7 +426,10 @@
(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
#~(lambda _
(parameterize ((%current-logfile-date-format ""))
(fork+exec-command
(list #$(file-append package "/bin/guix-build-coordinator-agent") (list #$(file-append package "/bin/guix-build-coordinator-agent")
#$(string-append "--coordinator=" coordinator) #$(string-append "--coordinator=" coordinator)
#$@(match authentication #$@(match authentication
@ -472,8 +482,11 @@
;; 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,7 +539,9 @@
(provision '(guix-build-coordinator-queue-builds)) (provision '(guix-build-coordinator-queue-builds))
(requirement '(networking)) (requirement '(networking))
(start (start
#~(make-forkexec-constructor #~(lambda _
(parameterize ((%current-logfile-date-format ""))
(fork+exec-command
(list (list
#$(file-append #$(file-append
package package
@ -557,8 +572,11 @@
`(,(string-append `(,(string-append
"GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale") "GUIX_LOCPATH=" #$glibc-utf8-locales "/lib/locale")
"LC_ALL=en_US.utf8") "LC_ALL=en_US.utf8")
#:log-file "/var/log/guix-build-coordinator/queue-builds.log")) #:log-file "/var/log/guix-build-coordinator/queue-builds.log"))))
(stop #~(make-kill-destructor)))))) (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