From 701540827e27a4f07ac725db3ce361d3be0c106f Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 19 Jan 2015 16:11:24 +0000 Subject: - 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) --- doc/s6-supervise.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'doc/s6-supervise.html') 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
  • s6-supervise sends a 'u' event to ./event whenever it successfully spawns ./run.
  • When ./run dies, s6-supervise sends a 'd' event to ./event.
  • -
  • When ./run dies, s6-supervise spawns ./finish if it exists.
  • +
  • When ./run dies, s6-supervise spawns ./finish if it exists. +./finish will have ./run's exit code as first argument, or 256 if +./run was signaled; it will have the number of the signal that killed ./run +as second argument, or an undefined number if ./run was not signaled.
  • ./finish must exit in less than 5 seconds. If it takes more than that, -s6-supervise kills it.
  • +s6-supervise kills it with a SIGKILL.
  • When ./finish dies, s6-supervise restarts ./run unless it has been told not to.
  • There is a minimum 1-second delay between two ./run spawns, to avoid busylooping -- cgit v1.2.3