GNU bug report logs - #28024
[PATCH] Upgrade Tailon from 1.1.1 to 1.3.0

Previous Next

Full log

Message #14 received at 28024 <at> debbugs.gnu.org (full text, mbox):

From: Christopher Baines <mail <at> cbaines.net>
To: 28024 <at> debbugs.gnu.org
Subject: [PATCH 3/5] services: Add missing wrap-lines option to tailon.
Date: Wed,  9 Aug 2017 09:06:02 +0100

* 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.
---
 doc/guix.texi          |  5 +++++
 gnu/services/admin.scm | 12 +++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 88bf0bb62..e4903be83 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -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
 
diff --git a/gnu/services/admin.scm b/gnu/services/admin.scm
index 1044833fe..19169427c 100644
--- a/gnu/services/admin.scm
+++ b/gnu/services/admin.scm
@@ -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
-- 
2.14.0

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.