summaryrefslogtreecommitdiff
path: root/gnu/services
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-09-24 11:28:14 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-09-24 11:28:59 +0200
commit80e26d74294d40f311f61d13996f1ed1aa4d8edd (patch)
treebe3e6b08da9dc6953e3bdcf13a9aa016da0d7c0e /gnu/services
parentc5d9cdd91359799354028a461a03950fba6704ef (diff)
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.
Diffstat (limited to 'gnu/services')
-rw-r--r--gnu/services/cuirass.scm16
1 files changed, 13 insertions, 3 deletions
diff --git a/gnu/services/cuirass.scm b/gnu/services/cuirass.scm
index 44f40a632c9..adf79af8ac4 100644
--- a/gnu/services/cuirass.scm
+++ b/gnu/services/cuirass.scm
@@ -56,6 +56,9 @@
56 (default "/var/log/cuirass-web.log")) 56 (default "/var/log/cuirass-web.log"))
57 (queries-log-file cuirass-configuration-queries-log-file ;string 57 (queries-log-file cuirass-configuration-queries-log-file ;string
58 (default #f)) 58 (default #f))
59 (web-queries-log-file
60 cuirass-configuration-web-queries-log-file ;string
61 (default #f))
59 (cache-directory cuirass-configuration-cache-directory ;string (dir-name) 62 (cache-directory cuirass-configuration-cache-directory ;string (dir-name)
60 (default "/var/cache/cuirass")) 63 (default "/var/cache/cuirass"))
61 (ttl cuirass-configuration-ttl ;integer 64 (ttl cuirass-configuration-ttl ;integer
@@ -90,6 +93,8 @@
90 (web-log-file (cuirass-configuration-web-log-file config)) 93 (web-log-file (cuirass-configuration-web-log-file config))
91 (log-file (cuirass-configuration-log-file config)) 94 (log-file (cuirass-configuration-log-file config))
92 (queries-log-file (cuirass-configuration-queries-log-file config)) 95 (queries-log-file (cuirass-configuration-queries-log-file config))
96 (web-queries-log-file
97 (cuirass-configuration-web-queries-log-file config))
93 (user (cuirass-configuration-user config)) 98 (user (cuirass-configuration-user config))
94 (group (cuirass-configuration-group config)) 99 (group (cuirass-configuration-group config))
95 (interval (cuirass-configuration-interval config)) 100 (interval (cuirass-configuration-interval config))
@@ -147,9 +152,9 @@
147 "--port" #$(number->string port) 152 "--port" #$(number->string port)
148 "--listen" #$host 153 "--listen" #$host
149 "--interval" #$(number->string interval) 154 "--interval" #$(number->string interval)
150 #$@(if queries-log-file 155 #$@(if web-queries-log-file
151 (list (string-append "--log-queries=" 156 (list (string-append "--log-queries="
152 queries-log-file)) 157 web-queries-log-file))
153 '()) 158 '())
154 #$@(if use-substitutes? '("--use-substitutes") '()) 159 #$@(if use-substitutes? '("--use-substitutes") '())
155 #$@(if fallback? '("--fallback") '()) 160 #$@(if fallback? '("--fallback") '())
@@ -198,11 +203,16 @@
198 203
199(define (cuirass-log-rotations config) 204(define (cuirass-log-rotations config)
200 "Return the list of log rotations that corresponds to CONFIG." 205 "Return the list of log rotations that corresponds to CONFIG."
201 (let ((queries-log-file (cuirass-configuration-queries-log-file config))) 206 (let ((queries-log-file (cuirass-configuration-queries-log-file config))
207 (web-queries-log-file
208 (cuirass-configuration-web-queries-log-file config)))
202 (list (log-rotation 209 (list (log-rotation
203 (files `(,(cuirass-configuration-log-file config) 210 (files `(,(cuirass-configuration-log-file config)
204 ,@(if queries-log-file 211 ,@(if queries-log-file
205 (list queries-log-file) 212 (list queries-log-file)
213 '())
214 ,@(if web-queries-log-file
215 (list web-queries-log-file)
206 '()))) 216 '())))
207 (frequency 'weekly) 217 (frequency 'weekly)
208 (options '("rotate 40")))))) ;worth keeping 218 (options '("rotate 40")))))) ;worth keeping