diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/index.html | 4 | ||||
| -rw-r--r-- | doc/servicedir.html | 9 | ||||
| -rw-r--r-- | doc/upgrade.html | 6 |
3 files changed, 16 insertions, 3 deletions
diff --git a/doc/index.html b/doc/index.html index 2a30cf2..dd78b1d 100644 --- a/doc/index.html +++ b/doc/index.html @@ -83,7 +83,7 @@ with s6</a> </li> <li> A POSIX-compliant system with a standard C development environment </li> <li> GNU make, version 3.81 or later </li> <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version -2.5.0.1 or later. It's a build-time requirement. It's also a run-time +2.5.1.0 or later. It's a build-time requirement. It's also a run-time requirement if you link against the shared version of the skalibs library. </li> <li> <a href="http://skarnet.org/software/execline/">execline</a> version @@ -100,7 +100,7 @@ library. </li> <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.5.0.1.tar.gz">2.5.0.1</a>. </li> + <li> The current released version of s6 is <a href="s6-2.5.1.0.tar.gz">2.5.1.0</a>. </li> <li> Alternatively, you can checkout a copy of the <a href="http://git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6 git repository</a>: 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 diff --git a/doc/upgrade.html b/doc/upgrade.html index cf10f2b..da4e5d8 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,13 +18,17 @@ <h1> What has changed in s6 </h1> -<h2> in 2.5.0.1 </h2> +<h2> in 2.5.1.0 </h2> <ul> <li> skalibs dependency bumped to 2.5.0.1. </li> <li> execline dependency bumped to 2.3.0.1. </li> <li> <a href="s6-ftrig-listen1.html">s6-ftrig-listen1</a> prints the last event it received to stdout. </li> + <li> The <tt>timeout-kill</tt> file is now recognized in a +<a href="servicedir.html">service directory</a> and allows +<a href="s6-svc.html">s6-svc -d</a> to send a SIGKILL after a timeout if the +process is still not dead after the initial SIGTERM and SIGCONT. </li> </ul> <h2> in 2.5.0.0 </h2> |