summary refs log tree commit diff
diff options
context:
space:
mode:
authorRicardo Wurmus <rekado@elephly.net>2019-08-29 08:04:21 +0200
committerRicardo Wurmus <rekado@elephly.net>2019-08-29 08:06:54 +0200
commit3e7a62e2e40fc575d161e4c06ea2e333ab7df3b3 (patch)
tree27974ce81041ccb24135c3cf81e082b5894ee8f1
parent54ddd852209a0bd8500dc7dd5775d5dd87a9a017 (diff)
downloadguix-3e7a62e2e40fc575d161e4c06ea2e333ab7df3b3.tar.gz
services: cuirass: Log web interface to separate file.
* gnu/services/cuirass.scm (<cuirass-configuration>): Add web-log-file field.
(cuirass-shepherd-service): Read it and use it.
* doc/guix.texi (Continuous Integration): Document it.
-rw-r--r--doc/guix.texi3
-rw-r--r--gnu/services/cuirass.scm7
2 files changed, 8 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 707c2ba700..5a64b89086 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -21387,6 +21387,9 @@ Data type representing the configuration of Cuirass.
 @item @code{log-file} (default: @code{"/var/log/cuirass.log"})
 Location of the log file.
 
+@item @code{web-log-file} (default: @code{"/var/log/cuirass-web.log"})
+Location of the log file used by the web interface.
+
 @item @code{cache-directory} (default: @code{"/var/cache/cuirass"})
 Location of the repository cache.
 
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 138a5cf67c..7bd43cd427 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2017 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2017 Jan Nieuwenhuizen <janneke@gnu.org>
-;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -52,6 +52,8 @@
                     (default cuirass))
   (log-file         cuirass-configuration-log-file ;string
                     (default "/var/log/cuirass.log"))
+  (web-log-file     cuirass-configuration-web-log-file ;string
+                    (default "/var/log/cuirass-web.log"))
   (cache-directory  cuirass-configuration-cache-directory ;string (dir-name)
                     (default "/var/cache/cuirass"))
   (ttl              cuirass-configuration-ttl     ;integer
@@ -83,6 +85,7 @@
    (cuirass-configuration? config)
    (let ((cuirass          (cuirass-configuration-cuirass config))
          (cache-directory  (cuirass-configuration-cache-directory config))
+         (web-log-file     (cuirass-configuration-web-log-file config))
          (log-file         (cuirass-configuration-log-file config))
          (user             (cuirass-configuration-user config))
          (group            (cuirass-configuration-group config))
@@ -140,7 +143,7 @@
 
                       #:user #$user
                       #:group #$group
-                      #:log-file #$log-file))
+                      #:log-file #$web-log-file))
             (stop #~(make-kill-destructor)))))))
 
 (define (cuirass-account config)