From 4c43193fa3f7b49e68778d7345759f27c883072f Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Fri, 19 May 2017 11:52:33 +0000
Subject:  Add the timeout-kill feature to s6-supervise. Prepare for version
 2.5.1.0.

---
 doc/servicedir.html | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'doc/servicedir.html')

diff --git a/doc/servicedir.html b/doc/servicedir.html
index a0d98f0..839e4d5 100644
--- a/doc/servicedir.html
+++ b/doc/servicedir.html
@@ -128,6 +128,15 @@ notification from the service and broadcast readiness, i.e. any
 <a href="s6-svlisten1.html">s6-svlisten1 -U</a> or
 <a href="s6-svlisten.html">s6-svlisten -U</a> processes will be
 triggered. </li>
+ <li> An optional regular file named <tt>timeout-kill</tt>. If such a file
+exists, it must only contain an unsigned integer <em>t</em>. If <em>t</em>
+is nonzero, then on receipt of a <a href="s6-svc.html">s6-svc -d</a> command,
+which sends a SIGTERM and a SIGCONT to the service, a timeout of <em>t</em>
+milliseconds is set; and if the service is still not dead after <em>t</em>
+milliseconds, then it is sent a SIGKILL. If <tt>timeout-kill</tt> does not
+exist, or contains 0 or an invalid value, then the service is never
+forcibly killed (unless, of course, a <a href="s6-svc.html">s6-svc -k</a>
+command is sent). </li>
  <li> An optional regular file named <tt>timeout-finish</tt>. If such a file
 exists, it must only contain an unsigned integer, which is the number of
 milliseconds after which the <tt>./finish</tt> script, if it exists, will
-- 
cgit v1.2.3