mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
services: guix: Add 'log-compression' option.
* gnu/services/base.scm (<guix-configuration>)[log-compression]: New field. (guix-shepherd-service): Use 'match-record' instead of 'match'. Honor 'log-compression'. * doc/guix.texi (Base Services): Document 'log-compression'.
This commit is contained in:
parent
767d24e83b
commit
f4596f7630
3 changed files with 37 additions and 32 deletions
|
@ -24,6 +24,7 @@
|
|||
(eval . (put 'guard 'scheme-indent-function 1))
|
||||
(eval . (put 'lambda* 'scheme-indent-function 1))
|
||||
(eval . (put 'substitute* 'scheme-indent-function 1))
|
||||
(eval . (put 'match-record 'scheme-indent-function 2))
|
||||
|
||||
;; 'modify-phases' and its keywords.
|
||||
(eval . (put 'modify-phases 'scheme-indent-function 1))
|
||||
|
|
|
@ -9929,6 +9929,10 @@ The number of seconds of silence and the number of seconds of activity,
|
|||
respectively, after which a build process times out. A value of zero
|
||||
disables the timeout.
|
||||
|
||||
@item @code{log-compression} (default: @code{'bzip2})
|
||||
The type of compression used for build logs---one of @code{gzip},
|
||||
@code{bzip2}, or @code{none}.
|
||||
|
||||
@item @code{extra-options} (default: @code{'()})
|
||||
List of extra command-line options for @command{guix-daemon}.
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
;;; GNU Guix --- Functional package management for GNU
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
|
||||
;;; Copyright © 2015, 2016 Alex Kost <alezost@gmail.com>
|
||||
;;; Copyright © 2015, 2016 Mark H Weaver <mhw@netris.org>
|
||||
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
|
||||
|
@ -1438,6 +1438,8 @@ (define-record-type* <guix-configuration>
|
|||
(default 0))
|
||||
(timeout guix-configuration-timeout ;integer
|
||||
(default 0))
|
||||
(log-compression guix-configuration-log-compression
|
||||
(default 'bzip2))
|
||||
(extra-options guix-configuration-extra-options ;list of strings
|
||||
(default '()))
|
||||
(log-file guix-configuration-log-file ;string
|
||||
|
@ -1452,13 +1454,10 @@ (define %default-guix-configuration
|
|||
|
||||
(define (guix-shepherd-service config)
|
||||
"Return a <shepherd-service> for the Guix daemon service with CONFIG."
|
||||
(match config
|
||||
(($ <guix-configuration> guix build-group build-accounts
|
||||
authorize-key? keys
|
||||
use-substitutes? substitute-urls
|
||||
max-silent-time timeout
|
||||
extra-options
|
||||
log-file http-proxy tmpdir)
|
||||
(match-record config <guix-configuration>
|
||||
(guix build-group build-accounts authorize-key? authorized-keys
|
||||
use-substitutes? substitute-urls max-silent-time timeout
|
||||
log-compression extra-options log-file http-proxy tmpdir)
|
||||
(list (shepherd-service
|
||||
(documentation "Run the Guix daemon.")
|
||||
(provision '(guix-daemon))
|
||||
|
@ -1469,6 +1468,7 @@ (define (guix-shepherd-service config)
|
|||
"--build-users-group" #$build-group
|
||||
"--max-silent-time" #$(number->string max-silent-time)
|
||||
"--timeout" #$(number->string timeout)
|
||||
"--log-compression" #$(symbol->string log-compression)
|
||||
#$@(if use-substitutes?
|
||||
'()
|
||||
'("--no-substitutes"))
|
||||
|
@ -1484,7 +1484,7 @@ (define (guix-shepherd-service config)
|
|||
'()))
|
||||
|
||||
#:log-file #$log-file))
|
||||
(stop #~(make-kill-destructor)))))))
|
||||
(stop #~(make-kill-destructor))))))
|
||||
|
||||
(define (guix-accounts config)
|
||||
"Return the user accounts and user groups for CONFIG."
|
||||
|
|
Loading…
Reference in a new issue