diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-19 16:11:24 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2015-01-19 16:11:24 +0000 |
| commit | 701540827e27a4f07ac725db3ce361d3be0c106f (patch) | |
| tree | 98c4b2fb8ba8f69ef791feebdcd61cd5bca34140 /doc/s6-supervise.html | |
| parent | 83853a80eb18238796154164f9ea776b0c167ab7 (diff) | |
| download | s6-701540827e27a4f07ac725db3ce361d3be0c106f.tar.xz | |
- added the s6_fdholder library to libs6. (Nothing useful yet.)
- fixed execline invocation in s6-log with slashpackage
- integrated s6_svc_main.c's functionality into s6-svscanctl and deleted it
- integrated Olivier Brunel's suggestions for wstat report in supervise/status
- minor fixes to s6-supervise's status reports
- separated sigaction calls in ftrigw_notifyb, this spares a few syscalls in s6-supervise
- updated doc to reflect the changes
- version bumped to 2.1.0.0 because API breakage (./finish, s6-svstat)
Diffstat (limited to 'doc/s6-supervise.html')
| -rw-r--r-- | doc/s6-supervise.html | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/s6-supervise.html b/doc/s6-supervise.html index b080626..d0d1e54 100644 --- a/doc/s6-supervise.html +++ b/doc/s6-supervise.html @@ -44,9 +44,12 @@ If it already exists, it uses it as is, without modifying the subscription right <li> s6-supervise sends a <tt>'u'</tt> event to <tt>./event</tt> whenever it successfully spawns <tt>./run</tt>. </li> <li> When <tt>./run</tt> dies, s6-supervise sends a <tt>'d'</tt> event to <tt>./event</tt>. </li> - <li> When <tt>./run</tt> dies, s6-supervise spawns <tt>./finish</tt> if it exists. </li> + <li> When <tt>./run</tt> dies, s6-supervise spawns <tt>./finish</tt> if it exists. +<tt>./finish</tt> will have <tt>./run</tt>'s exit code as first argument, or 256 if +<tt>./run</tt> was signaled; it will have the number of the signal that killed <tt>./run</tt> +as second argument, or an undefined number if <tt>./run</tt> was not signaled. </li> <li> <tt>./finish</tt> must exit in less than 5 seconds. If it takes more than that, -s6-supervise kills it. </li> +s6-supervise kills it with a SIGKILL. </li> <li> When <tt>./finish</tt> dies, s6-supervise restarts <tt>./run</tt> unless it has been told not to. </li> <li> There is a minimum 1-second delay between two <tt>./run</tt> spawns, to avoid busylooping |