From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dfM1D-0000R3-RR for guix-patches@gnu.org; Wed, 09 Aug 2017 04:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dfM19-0003Ai-Lv for guix-patches@gnu.org; Wed, 09 Aug 2017 04:07:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43929) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dfM19-0003Ab-HP for guix-patches@gnu.org; Wed, 09 Aug 2017 04:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dfM19-00067y-Bn for guix-patches@gnu.org; Wed, 09 Aug 2017 04:07:03 -0400 Subject: [bug#28024] [PATCH 3/5] services: Add missing wrap-lines option to tailon. Resent-Message-ID: From: Christopher Baines Date: Wed, 9 Aug 2017 09:06:02 +0100 Message-Id: <20170809080604.6236-3-mail@cbaines.net> In-Reply-To: <20170809080604.6236-1-mail@cbaines.net> References: <20170809080604.6236-1-mail@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28024@debbugs.gnu.org * gnu/services/admin.scm (): 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 @@ -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 (($ 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 make-tailon-configuration -- 2.14.0