diff options
| author | Benjamin Chabanne <benjamin@uvy.fr> | 2025-09-28 14:19:00 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2025-10-06 11:00:08 +0200 |
| commit | be39b5dee51395aa8acd29d17bc027dba1752443 (patch) | |
| tree | 56b08beac0efbc9bb2fcfc21442669fb002293e1 /gnu/services/admin.scm | |
| parent | ef42ecb8cb6c1868e57505a9593f0c0590980de1 (diff) | |
services: log-rotation: Allow to pass procedure as compression method.
* gnu/services/admin.scm (log-rotation-configuration): Change
validation method and accept gexp procedure.
Change-Id: I67cd5051a05d211349ecbc66ee3a55ab5b1a5971
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'gnu/services/admin.scm')
| -rw-r--r-- | gnu/services/admin.scm | 57 |
1 files changed, 33 insertions, 24 deletions
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm index 20e4517c667..6e5d51e7ce6 100644 --- a/gnu/services/admin.scm +++ b/gnu/services/admin.scm @@ -123,6 +123,9 @@ (define (gexp-or-integer? x) (or (gexp? x) (integer? x))) +(define (gexp-or-symbol? x) + (or (gexp? x) (symbol? x))) + (define-configuration log-rotation-configuration (provision (list-of-symbols '(log-rotation)) @@ -144,9 +147,10 @@ calendar events." rotated." empty-serializer) (compression - (symbol 'zstd) - "The compression method used for rotated log files, one of -@code{'none}, @code{'gzip}, and @code{'zstd}." + (gexp-or-symbol 'zstd) + "The compression method used for rotated log files, one of @code{'none}, +@code{'gzip}, and @code{'zstd}. Alternatively, it can be a gexp that evaluates +to a procedure; that procedure gets called with the file to be rotated." empty-serializer) (expiry (gexp-or-integer #~(%default-log-expiry)) @@ -158,27 +162,32 @@ rotated." empty-serializer)) (define (log-rotation-shepherd-services config) - (list (shepherd-service - (provision (log-rotation-configuration-provision config)) - (requirement (log-rotation-configuration-requirement config)) - (modules '((shepherd service timer) ;for 'calendar-event' - (shepherd service log-rotation))) - (free-form #~(log-rotation-service - #$(log-rotation-configuration-calendar-event config) - #:provision - '#$(log-rotation-configuration-provision config) - #:requirement - '#$(log-rotation-configuration-requirement config) - #:external-log-files - '#$(log-rotation-configuration-external-log-files - config) - #:compression - '#$(log-rotation-configuration-compression config) - #:expiry - #$(log-rotation-configuration-expiry config) - #:rotation-size-threshold - #$(log-rotation-configuration-size-threshold - config)))))) + (let* ((compression-raw (log-rotation-configuration-compression config)) + (compression + (if (symbol? compression-raw) + #~'#$compression-raw + compression-raw))) + (list (shepherd-service + (provision (log-rotation-configuration-provision config)) + (requirement (log-rotation-configuration-requirement config)) + (modules '((shepherd service timer) ;for 'calendar-event' + (shepherd service log-rotation))) + (free-form #~(log-rotation-service + #$(log-rotation-configuration-calendar-event config) + #:provision + '#$(log-rotation-configuration-provision config) + #:requirement + '#$(log-rotation-configuration-requirement config) + #:external-log-files + '#$(log-rotation-configuration-external-log-files + config) + #:compression + #$compression + #:expiry + #$(log-rotation-configuration-expiry config) + #:rotation-size-threshold + #$(log-rotation-configuration-size-threshold + config))))))) (define log-rotation-service-type (service-type |