diff options
| -rw-r--r-- | COPYING | 2 | ||||
| -rw-r--r-- | doc/index.html | 2 | ||||
| -rw-r--r-- | doc/s6-svscan.html | 8 | ||||
| -rw-r--r-- | doc/upgrade.html | 7 | ||||
| -rwxr-xr-x | examples/s6-svscanboot | 7 | ||||
| -rw-r--r-- | package/info | 2 | ||||
| -rw-r--r-- | src/supervision/s6-svscan.c | 2 |
7 files changed, 18 insertions, 12 deletions
@@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Laurent Bercot <ska-skaware@skarnet.org> +Copyright (c) 2011-2016 Laurent Bercot <ska-skaware@skarnet.org> Permission to use, copy, modify, and distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/doc/index.html b/doc/index.html index dbc2cb0..44c77c4 100644 --- a/doc/index.html +++ b/doc/index.html @@ -100,7 +100,7 @@ library. </li> <h3> Download </h3> <ul> - <li> The current released version of s6 is <a href="s6-2.2.4.3.tar.gz">2.2.4.3</a>. </li> + <li> The current released version of s6 is <a href="s6-2.3.0.0.tar.gz">2.3.0.0</a>. </li> <li> Alternatively, you can checkout a copy of the s6 git repository: <pre> git clone git://git.skarnet.org/s6 </pre> </li> <li> There's also a diff --git a/doc/s6-svscan.html b/doc/s6-svscan.html index 6c4d8d9..764dc4c 100644 --- a/doc/s6-svscan.html +++ b/doc/s6-svscan.html @@ -73,12 +73,10 @@ approximately 50 bytes per service. </li> descriptors to function properly and does not exceed its stack limit. The default of 500 is safe and provides enough room for every reasonable system. </li> <li> <tt>-t <em>rescan</em></tt> : perform a scan every <em>rescan</em> -milliseconds. If <em>rescan</em> is 0, automatic scans are never performed after +milliseconds. If <em>rescan</em> is 0 (the default), automatic scans are never performed after the first one and s6-svscan will only detect new services when told to via a -<a href="s6-svscanctl.html">s6-svscanctl -a</a> command. The default <em>rescan</em> -value is 5000, for compatibility with daemontools' -<a href="http://cr.yp.to/daemontools/svscan.html">svscan</a>, which performs a -scan (and a reap) every 5 seconds. It is <em>strongly</em> discouraged to set +<a href="s6-svscanctl.html">s6-svscanctl -a</a> command. +It is <em>strongly</em> discouraged to set <em>rescan</em> to a positive value under 500. </li> </ul> diff --git a/doc/upgrade.html b/doc/upgrade.html index fb8a875..ebf031f 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,6 +18,13 @@ <h1> What has changed in s6 </h1> +<h2> in 2.3.0.0 </h2> + +<ul> + <li> <a href="s6-svscan.html">s6-svscan</a> now defaults to <tt>-t0</tt> +instead of <tt>-t5000</tt>. </li> +</ul> + <h2> in 2.2.4.3 </h2> <ul> diff --git a/examples/s6-svscanboot b/examples/s6-svscanboot index 2e36623..d5ae2a3 100755 --- a/examples/s6-svscanboot +++ b/examples/s6-svscanboot @@ -1,8 +1,9 @@ #!/command/execlineb -P -exec -c +s6-envdir -I /service/.s6-svscan/env +s6-setsid -qb +redirfd -r 0 /dev/null redirfd -wnb 1 /service/s6-svscan-log/fifo fdmove -c 2 1 -s6-envdir -I /service/.s6-svscan/env -exec -a s6-svscan +exec -c -a s6-svscan s6-svscan -t0 /service diff --git a/package/info b/package/info index 327bade..6e97fac 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.2.4.3 +version=2.3.0.0 category=admin package_macro_name=S6 diff --git a/src/supervision/s6-svscan.c b/src/supervision/s6-svscan.c index 29b0429..28ce830 100644 --- a/src/supervision/s6-svscan.c +++ b/src/supervision/s6-svscan.c @@ -453,7 +453,7 @@ int main (int argc, char const *const *argv) PROG = "s6-svscan" ; { subgetopt_t l = SUBGETOPT_ZERO ; - unsigned int t = 5000 ; + unsigned int t = 0 ; for (;;) { register int opt = subgetopt_r(argc, argv, "Sst:c:", &l) ; |