branch master updated: services: cuirass: Add web SQL queries logging support.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 80e26d7  services: cuirass: Add web SQL queries logging support.
80e26d7 is described below

commit 80e26d74294d40f311f61d13996f1ed1aa4d8edd
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Thu Sep 24 11:28:14 2020 +0200

    services: cuirass: Add web SQL queries logging support.
    
    * gnu/services/cuirass.scm (<cuirass-configuration>)[web-queries-log-file]:
    New field.
    (cuirass-shepherd-service): Honor it.
    (cuirass-log-rotations): If defined, add the web queries log file to the log
    rotation.
---
 doc/guix.texi            |  4 ++++
 gnu/services/cuirass.scm | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 5768452..6b2c749 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -23908,6 +23908,10 @@ Location of the log file used by the web interface.
 Location of the SQL queries log file. By default, SQL queries logging is
 disabled.
 
+@item @code{web-queries-log-file} (default: @code{#f})
+Location of the web SQL queries log file. By default, web SQL queries
+logging is disabled.
+
 @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 44f40a6..adf79af 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -56,6 +56,9 @@
                     (default "/var/log/cuirass-web.log"))
   (queries-log-file cuirass-configuration-queries-log-file ;string
                     (default #f))
+  (web-queries-log-file
+                    cuirass-configuration-web-queries-log-file ;string
+                    (default #f))
   (cache-directory  cuirass-configuration-cache-directory ;string (dir-name)
                     (default "/var/cache/cuirass"))
   (ttl              cuirass-configuration-ttl     ;integer
@@ -90,6 +93,8 @@
         (web-log-file     (cuirass-configuration-web-log-file config))
         (log-file         (cuirass-configuration-log-file config))
         (queries-log-file (cuirass-configuration-queries-log-file config))
+        (web-queries-log-file
+                          (cuirass-configuration-web-queries-log-file config))
         (user             (cuirass-configuration-user config))
         (group            (cuirass-configuration-group config))
         (interval         (cuirass-configuration-interval config))
@@ -147,9 +152,9 @@
                            "--port" #$(number->string port)
                            "--listen" #$host
                            "--interval" #$(number->string interval)
-                           #$@(if queries-log-file
+                           #$@(if web-queries-log-file
                                   (list (string-append "--log-queries="
-                                                       queries-log-file))
+                                                       web-queries-log-file))
                                   '())
                            #$@(if use-substitutes? '("--use-substitutes") '())
                            #$@(if fallback? '("--fallback") '())
@@ -198,11 +203,16 @@
 
 (define (cuirass-log-rotations config)
   "Return the list of log rotations that corresponds to CONFIG."
-  (let ((queries-log-file (cuirass-configuration-queries-log-file config)))
+  (let ((queries-log-file (cuirass-configuration-queries-log-file config))
+        (web-queries-log-file
+         (cuirass-configuration-web-queries-log-file config)))
     (list (log-rotation
            (files `(,(cuirass-configuration-log-file config)
                     ,@(if queries-log-file
                           (list queries-log-file)
+                          '())
+                    ,@(if web-queries-log-file
+                          (list web-queries-log-file)
                           '())))
            (frequency 'weekly)
            (options '("rotate 40"))))))              ;worth keeping