about summary refs log tree commit diff
path: root/doc
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2023-05-26 15:29:13 +0000
committerLaurent Bercot <ska@appnovation.com>2023-05-26 15:29:13 +0000
commit6c936711c61df41eeb936a98e6bc43584776ab08 (patch)
tree5680cc78faeee3ab07be73dfaacf1c77437ee6d7 /doc
parent3457a5ce01d7df3bc4cdc6259736ca210b4d4765 (diff)
downloads6-6c936711c61df41eeb936a98e6bc43584776ab08.tar.gz
s6-6c936711c61df41eeb936a98e6bc43584776ab08.tar.xz
s6-6c936711c61df41eeb936a98e6bc43584776ab08.zip
Add -t lastlinetimeout option to s6-log
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/s6-log.html11
-rw-r--r--doc/upgrade.html2
2 files changed, 12 insertions, 1 deletions
diff --git a/doc/s6-log.html b/doc/s6-log.html
index a76f9aa..6e24e4c 100644
--- a/doc/s6-log.html
+++ b/doc/s6-log.html
@@ -27,7 +27,7 @@ with full POSIX regular expression support.
 <h2> Interface </h2>
 
 <pre>
-     s6-log [ -d <em>notif</em> ] [ -q | -v ] [ -b ] [ -p ] [ -l <em>linelimit</em> ] [ -- ] <em>logging script</em>
+     s6-log [ -d <em>notif</em> ] [ -q | -v ] [ -b ] [ -p ] [ -l <em>linelimit</em> ] [ -t <em>lastlinetimeout</em> ] [ -- ] <em>logging script</em>
 </pre>
 
 <p>
@@ -75,6 +75,15 @@ etc. <em>linelimit</em> cannot be less than 48, unless it is 0 (which means
 infinite). The default is 8192 bytes. Setting <em>linelimit</em> to 0 ensures
 that lines will never be split; this may cause important memory consumption
 by s6-log if it is fed extremely long lines, so use with caution. </li>
+ <li> <tt>-t&nbsp;<em>lastlinetimeout</em></tt>&nbsp;: if s6-log receives
+a termination signal but has a read a partial line in its buffer, it will
+wait for at most <em>lastlinetimeout</em> milliseconds for its service
+to send it the remainder of the line; if it still hasn't read a newline
+character by then, it will add a newline character itself and process the
+line, then exit. By default, <em>lastlinetimeout</em> is 2000, which means
+s6-log will wait for at most 2 seconds for completion of its last partial line.
+If <em>lastlinetimeout</em> is given as <strong>0</strong>, then s6-log
+will wait forever; it won't exit until it actually reads a newline or EOF. </li>
 </ul>
 
 <h2> Logdirs </h2>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 4307f3e..2922250 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -23,6 +23,8 @@
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
 dependency bumped to 2.13.2.0. </li>
+ <li> New <tt>-s</tt> option to <a href="s6-svc.html">s6-svc</a>. </li>
+ <li> New <tt>-t</tt> option to <a href="s6-log.html">s6-log</a>. </li>
 </ul>
 
 <h2> in 2.11.3.2 </h2>