diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2022-08-21 02:37:46 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska@appnovation.com> | 2022-08-21 02:37:46 +0000 |
| commit | 355d6a83810e1b7bb3bc2ccd3102141dbea63821 (patch) | |
| tree | 440b74bcb53aa14c8b9636f00154738040a49c73 /doc/s6-supervise.html | |
| parent | 6920ddc814d709bc60c162c1fef794b108940e95 (diff) | |
| download | s6-355d6a83810e1b7bb3bc2ccd3102141dbea63821.tar.xz | |
Add upper limit to -c in s6-svscan
Also document it, and document changes to s6-supervise
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'doc/s6-supervise.html')
| -rw-r--r-- | doc/s6-supervise.html | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/s6-supervise.html b/doc/s6-supervise.html index 404e896..86d97a6 100644 --- a/doc/s6-supervise.html +++ b/doc/s6-supervise.html @@ -135,7 +135,12 @@ effective group id as the s6-supervise process. If it already exists, it uses it as is, without modifying the subscription rights. </li> <li> It <a href="libs6/ftrigw.html">sends</a> a <tt>'s'</tt> event to <tt>./event</tt>. </li> <li> If the default service state is up (i.e. there is no <tt>./down</tt> file), -s6-supervise spawns <tt>./run</tt>. </li> +s6-supervise spawns <tt>./run</tt>. One argument is given to the <tt>./run</tt> +program: <em>servicedir</em>, the name of the directory s6-supervise is being +run on. It is given exactly as given to s6-supervise, without recanonicalization. +In particular, if s6-supervise is being managed by <a href="s6-svscan.html">s6-svscan</a>, +<em>servicedir</em> is always of the form <tt><em>foo</em></tt> or <tt><em>foo</em>/log</tt>, +and <em>foo</em> contains no slashes. </li> <li> s6-supervise sends a <tt>'u'</tt> event to <tt>./event</tt> whenever it successfully spawns <tt>./run</tt>. </li> <li> If there is a <tt>./notification-fd</tt> file in the service directory and, @@ -152,7 +157,8 @@ service for readiness. </li> It then 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> +as second argument, or an undefined number if <tt>./run</tt> was not signaled; +and it will have <em>servicedir</em> as third argument. </li> <li> By default, <tt>./finish</tt> must exit in less than 5 seconds. If it takes more than that, s6-supervise kills it with a SIGKILL. This can be configured via the <tt>./timeout-finish</tt> file, see the description in the |