amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: Add missing wrap-lines option to tailon.

Browse source 
* gnu/services/admin.scm (<tailon-configuration-file>): Add wrap-lines.
  (tailon-configuration-wrap-lines): New procedure.
  (tailon-configuration-file-compiler): Add support for wrap-lines.
* doc/guix.texi (Monitoring Services): Document the wrap-lines Tailon
  configuration option.
This commit is contained in:
Christopher Baines 2017-07-26 12:22:38 +01:00
parent 761f5865c8
commit f2d8e7f720
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/guix.texi
View file

@ -13769,6 +13769,11 @@ Commands to allow running. By default, @code{sed} is disabled.
@item @code{debug?} (default: @code{#f}) @item @code{debug?} (default: @code{#f})
Set @code{debug?} to @code{#t} to show debug messages. Set @code{debug?} to @code{#t} to show debug messages.
@item @code{wrap-lines} (default: @code{#t})
Initial line wrapping state in the web interface. Set to @code{#t} to
initially wrap lines (the default), or to @code{#f} to initially not
wrap lines.
@end table @end table
@end deftp @end deftp

12
gnu/services/admin.scm
View file

@ -59,6 +59,8 @@
tailon-configuration-file-tail-lines tailon-configuration-file-tail-lines
tailon-configuration-file-allowed-commands tailon-configuration-file-allowed-commands
tailon-configuration-file-debug? tailon-configuration-file-debug?
tailon-configuration-file-wrap-lines
<tailon-configuration> <tailon-configuration>
tailon-configuration tailon-configuration
@ -220,7 +222,9 @@ for ROTATION."
(allowed-commands tailon-configuration-file-allowed-commands (allowed-commands tailon-configuration-file-allowed-commands
(default '("tail" "grep" "awk"))) (default '("tail" "grep" "awk")))
(debug? tailon-configuration-file-debug? (debug? tailon-configuration-file-debug?
(default #f))) (default #f))
(wrap-lines tailon-configuration-file-wrap-lines
(default #t)))
(define (tailon-configuration-files-string files) (define (tailon-configuration-files-string files)
(string-append (string-append
@ -249,7 +253,8 @@ for ROTATION."
(match file (match file
(($ <tailon-configuration-file> files bind relative-root (($ <tailon-configuration-file> files bind relative-root
allow-transfers? follow-names? allow-transfers? follow-names?
tail-lines allowed-commands debug?) tail-lines allowed-commands debug?
wrap-lines)
(text-file (text-file
"tailon-config.yaml" "tailon-config.yaml"
(string-concatenate (string-concatenate
@ -267,7 +272,8 @@ for ROTATION."
("commands" . ,(string-append "[" ("commands" . ,(string-append "["
(string-join allowed-commands ", ") (string-join allowed-commands ", ")
"]")) "]"))
,@(if debug? '(("debug" . "true")) '())))))))) ,@(if debug? '(("debug" . "true")) '())
("wrap-lines" . ,(if wrap-lines "true" "false")))))))))
(define-record-type* <tailon-configuration> (define-record-type* <tailon-configuration>
tailon-configuration make-tailon-configuration tailon-configuration make-tailon-configuration