From 3bcbbe18f9a60c0743c30d391c7878034e4b1274 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 18 Mar 2016 22:16:08 +0000 Subject: - s6-svscan defaults to -t0 instead of -t5000 - rc for v2.3.0.0, waiting to update deps before releasing --- COPYING | 2 +- doc/index.html | 2 +- doc/s6-svscan.html | 8 +++----- doc/upgrade.html | 7 +++++++ examples/s6-svscanboot | 7 ++++--- package/info | 2 +- src/supervision/s6-svscan.c | 2 +- 7 files changed, 18 insertions(+), 12 deletions(-) diff --git a/COPYING b/COPYING index a49b1ca..f496e31 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2011-2015 Laurent Bercot +Copyright (c) 2011-2016 Laurent Bercot 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.

Download

    -
  • The current released version of s6 is 2.2.4.3.
    • +
  • The current released version of s6 is 2.3.0.0.
  • Alternatively, you can checkout a copy of the s6 git repository: 
     git clone git://git.skarnet.org/s6
  • 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.
    • 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.
  • -t rescan : perform a scan every rescan -milliseconds. If rescan is 0, automatic scans are never performed after +milliseconds. If rescan 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 -s6-svscanctl -a command. The default rescan -value is 5000, for compatibility with daemontools' -svscan, which performs a -scan (and a reap) every 5 seconds. It is strongly discouraged to set +s6-svscanctl -a command. +It is strongly discouraged to set rescan to a positive value under 500.
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 @@

What has changed in s6

+

in 2.3.0.0

+ +
    +
  • s6-svscan now defaults to -t0 +instead of -t5000.
    • +
+

in 2.2.4.3

    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) ; -- cgit v1.2.3