~ruther/guix-local

f2d8e7f720c92dfb0f49d61f7b66d45e3e63e4cd — Christopher Baines 8 years ago 761f586
services: Add missing wrap-lines option to tailon.

* 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.
2 files changed, 14 insertions(+), 3 deletions(-)

M doc/guix.texi
M gnu/services/admin.scm
M doc/guix.texi => doc/guix.texi +5 -0
@@ 13769,6 13769,11 @@ Commands to allow running. By default, @code{sed} is disabled.
@item @code{debug?} (default: @code{#f})
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 deftp


M gnu/services/admin.scm => gnu/services/admin.scm +9 -3
@@ 59,6 59,8 @@
            tailon-configuration-file-tail-lines
            tailon-configuration-file-allowed-commands
            tailon-configuration-file-debug?
            tailon-configuration-file-wrap-lines


            <tailon-configuration>
            tailon-configuration


@@ 220,7 222,9 @@ for ROTATION."
  (allowed-commands        tailon-configuration-file-allowed-commands
                           (default '("tail" "grep" "awk")))
  (debug?                  tailon-configuration-file-debug?
                           (default #f)))
                           (default #f))
  (wrap-lines              tailon-configuration-file-wrap-lines
                           (default #t)))

(define (tailon-configuration-files-string files)
  (string-append


@@ 249,7 253,8 @@ for ROTATION."
  (match file
    (($ <tailon-configuration-file> files bind relative-root
                                    allow-transfers? follow-names?
                                    tail-lines allowed-commands debug?)
                                    tail-lines allowed-commands debug?
                                    wrap-lines)
     (text-file
      "tailon-config.yaml"
      (string-concatenate


@@ 267,7 272,8 @@ for ROTATION."
          ("commands" . ,(string-append "["
                                        (string-join allowed-commands ", ")
                                        "]"))
          ,@(if debug? '(("debug" . "true")) '()))))))))
          ,@(if debug? '(("debug" . "true")) '())
          ("wrap-lines" . ,(if wrap-lines "true" "false")))))))))

(define-record-type* <tailon-configuration>
  tailon-configuration make-tailon-configuration