[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
106/155: services: guix: Add 'log-file' configuration option.
From: |
John Darrington |
Subject: |
106/155: services: guix: Add 'log-file' configuration option. |
Date: |
Wed, 21 Dec 2016 20:48:37 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit 06c364f1a5c338813115d4083f6436c9d6169773
Author: Ludovic Courtès <address@hidden>
Date: Mon Dec 19 23:54:39 2016 +0100
services: guix: Add 'log-file' configuration option.
* gnu/services/base.scm (<guix-configuration>)[log-file]: New field.
(guix-shepherd-service): Pass #:log-file to 'make-forkexec-constructor'.
* gnu/services/admin.scm (simple-rotation-config): Take a list of
files and join them with commas.
(%default-rotations): Add /var/log/guix-daemon.log.
* doc/guix.texi (Base Services): Document it.
---
doc/guix.texi | 4 ++++
gnu/services/admin.scm | 7 ++++---
gnu/services/base.scm | 8 ++++++--
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7c37468..bb96385 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -8299,6 +8299,10 @@ The list of URLs where to look for substitutes by
default.
@item @code{extra-options} (default: @code{'()})
List of extra command-line options for @command{guix-daemon}.
address@hidden @code{log-file} (default: @code{"/var/log/guix-daemon.log"})
+File where @command{guix-daemon}'s standard output and standard error
+are written.
+
@item @code{lsof} (default: @var{lsof})
The lsof package to use.
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index d8086b7..deaf677 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -58,8 +58,8 @@
}
"))
-(define (simple-rotation-config file)
- (string-append file " {
+(define (simple-rotation-config files)
+ #~(string-append #$(string-join files ",") " {
sharedscripts
}
"))
@@ -72,7 +72,8 @@
(display #$(syslog-rotation-config %rotated-files)
port)
(display #$(simple-rotation-config
- "/var/log/shepherd.log")
+ '("/var/log/shepherd.log"
+ "/var/log/guix-daemon.log"))
port)))))))
(define (default-jobs rottlog)
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index f2bac29..1b1ce0d 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1089,6 +1089,8 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(default %default-substitute-urls))
(extra-options guix-configuration-extra-options ;list of strings
(default '()))
+ (log-file guix-configuration-log-file ;string
+ (default "/var/log/guix-daemon.log"))
(lsof guix-configuration-lsof ;<package>
(default lsof)))
@@ -1101,7 +1103,7 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
(($ <guix-configuration> guix build-group build-accounts
authorize-key? keys
use-substitutes? substitute-urls extra-options
- lsof)
+ log-file lsof)
(list (shepherd-service
(documentation "Run the Guix daemon.")
(provision '(guix-daemon))
@@ -1118,7 +1120,9 @@ failed to register hydra.gnu.org public key: ~a~%"
status))))))))
;; Add 'lsof' (for the GC) to the daemon's $PATH.
#:environment-variables
- (list (string-append "PATH=" #$lsof "/bin"))))
+ (list (string-append "PATH=" #$lsof "/bin"))
+
+ #:log-file #$log-file))
(stop #~(make-kill-destructor)))))))
(define (guix-accounts config)
- 108/155: gnu: enlightenment: Update to 0.21.5., (continued)
- 108/155: gnu: enlightenment: Update to 0.21.5., John Darrington, 2016/12/21
- 81/155: gnu: openssh: Update to 7.4p1., John Darrington, 2016/12/21
- 105/155: services: guix: Remove dependency on lsh., John Darrington, 2016/12/21
- 123/155: build: Bump version number., John Darrington, 2016/12/21
- 119/155: gnu: cuirass: Make sure 'cuirass' has 'evaluate' in $PATH., John Darrington, 2016/12/21
- 125/155: import: pypi: Match new 'pypi-uri' domain in updater., John Darrington, 2016/12/21
- 133/155: gnu: nss: Add comment about test failures in NSS 3.27.2, John Darrington, 2016/12/21
- 73/155: gnu: mig: Update to 1.8., John Darrington, 2016/12/21
- 99/155: gnu: utox: Update to 0.11.0., John Darrington, 2016/12/21
- 109/155: gnu: cutadapt: Use ‘modify-phases’ syntax., John Darrington, 2016/12/21
- 106/155: services: guix: Add 'log-file' configuration option.,
John Darrington <=
- 121/155: services: cuirass: Add Cuirass to the system profile., John Darrington, 2016/12/21
- 128/155: mailmap: Add alias for Marius Bakke., John Darrington, 2016/12/21
- 126/155: build: Delete all the .service and .conf files upon 'make clean'., John Darrington, 2016/12/21
- 134/155: gnu: borg: Update to 1.0.9., John Darrington, 2016/12/21
- 136/155: gnu: mailutils: Update to 3.1.1., John Darrington, 2016/12/21
- 137/155: gnu: mailutils: Use 'modify-phases' syntax., John Darrington, 2016/12/21
- 130/155: environment: Add '--root' option., John Darrington, 2016/12/21
- 144/155: gnu: imagemagick: Update to 6.9.7-0., John Darrington, 2016/12/21
- 149/155: gnu: jsoncpp: Update to 1.8.0., John Darrington, 2016/12/21
- 152/155: gnu: lablgtk: Update to 2.18.5, John Darrington, 2016/12/21