[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/02: services: guix: Add 'max-silent-time' and 'timeout'.
From: |
Ludovic Courtès |
Subject: |
02/02: services: guix: Add 'max-silent-time' and 'timeout'. |
Date: |
Sun, 4 Jun 2017 19:47:26 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 3bee4b61963bf0e0da4e5a52a0ba24fe0aae2302
Author: Ludovic Courtès <address@hidden>
Date: Mon Jun 5 01:41:11 2017 +0200
services: guix: Add 'max-silent-time' and 'timeout'.
* gnu/services/base.scm (<guix-configuration>)[max-silent-time]
[timeout]: New fields.
(guix-shepherd-service): Honor them.
* doc/guix.texi (Base Services): Document them.
---
doc/guix.texi | 6 ++++++
gnu/services/base.scm | 10 +++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index e8fba43..13e692f 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -9260,6 +9260,12 @@ Whether to use substitutes.
@item @code{substitute-urls} (default: @var{%default-substitute-urls})
The list of URLs where to look for substitutes by default.
address@hidden @code{max-silent-time} (default: @code{0})
address@hidden @code{timeout} (default: @code{0})
+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{extra-options} (default: @code{'()})
List of extra command-line options for @command{guix-daemon}.
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index 7cd9a34..813535e 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1352,6 +1352,10 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(default #t))
(substitute-urls guix-configuration-substitute-urls ;list of strings
(default %default-substitute-urls))
+ (max-silent-time guix-configuration-max-silent-time ;integer
+ (default 0))
+ (timeout guix-configuration-timeout ;integer
+ (default 0))
(extra-options guix-configuration-extra-options ;list of strings
(default '()))
(log-file guix-configuration-log-file ;string
@@ -1371,7 +1375,9 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(match config
(($ <guix-configuration> guix build-group build-accounts
authorize-key? keys
- use-substitutes? substitute-urls extra-options
+ use-substitutes? substitute-urls
+ max-silent-time timeout
+ extra-options
log-file lsof http-proxy tmpdir)
(list (shepherd-service
(documentation "Run the Guix daemon.")
@@ -1381,6 +1387,8 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
#~(make-forkexec-constructor
(list #$(file-append guix "/bin/guix-daemon")
"--build-users-group" #$build-group
+ "--max-silent-time" #$(number->string max-silent-time)
+ "--timeout" #$(number->string timeout)
#$@(if use-substitutes?
'()
'("--no-substitutes"))