From 5f247199e897e2d79d1a31bfb53e2fdc943a4bde Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Thu, 27 Aug 2015 17:12:13 +0000
Subject: - New -wr | -wR options to s6-svc, s6-svlisten1 and s6-svlisten -
skalibs and execline dep bump - rc for 2.2.1.0 unless more new functionality
is needed for s6-rc
---
doc/index.html | 6 +++---
doc/s6-svc.html | 14 +++++++++++++-
doc/s6-svlisten.html | 11 +++++++++--
doc/s6-svlisten1.html | 7 ++++++-
doc/upgrade.html | 11 +++++++++++
5 files changed, 42 insertions(+), 7 deletions(-)
(limited to 'doc')
diff --git a/doc/index.html b/doc/index.html
index 500d450..b458c92 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -84,11 +84,11 @@ with s6
GNU make, version 4.0 or later. Please be aware that s6 will not build
with an earlier version.
skalibs version
-2.3.6.1 or later. It's a build-time requirement. It's also a run-time
+2.3.7.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs
library.
execline version
-2.1.3.1 or later. It's a build-time and run-time requirement.
+2.1.4.0 or later. It's a build-time and run-time requirement.
Licensing
@@ -101,7 +101,7 @@ library.
Download
- - The current released version of s6 is 2.2.0.1.
+ - The current released version of s6 is 2.2.1.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-svc.html b/doc/s6-svc.html
index 86e6857..7c3b2bd 100644
--- a/doc/s6-svc.html
+++ b/doc/s6-svc.html
@@ -28,7 +28,7 @@ knowing their PIDs, and without using horrible hacks such as .pid files.
Interface
- s6-svc [ -wu | -wU | -wd | -wD ] [ -T timeout ] [ -abqhkti12pcoduxO ] servicedir
+ s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T timeout ] [ -abqhkti12pcoduxO ] servicedir
@@ -89,6 +89,11 @@ a notification-fd file to tell
s6-supervise to accept readiness
notification, s6-svc will print a warning and act as if the -wu
option had been given instead.
+ - -wr : s6-svc will not exit until the service has been
+started or restarted.
+ - -wR : s6-svc will not exit until the service has been
+started or restarted and has notified readiness.
+
Usage examples
@@ -119,6 +124,13 @@ the finish script has completed.
is ready. Exit 1 if it is still not ready after 5 seconds.
+ s6-svc -wR -t /service/ftpd
+
+ Send a SIGTERM to the ftpd server; wait for
+s6-supervise to restart it, and block
+until it has notified that it is ready to serve again.
+
+
s6-svc -a /service/httpd/log
Send a SIGALRM to the logger process for the httpd server. If this logger
diff --git a/doc/s6-svlisten.html b/doc/s6-svlisten.html
index 1db24c0..2426fc9 100644
--- a/doc/s6-svlisten.html
+++ b/doc/s6-svlisten.html
@@ -34,7 +34,7 @@ a collection of supervised services, and blocks until they all go up, or down.
- s6-svlisten [ -U | -u | -D | -d ] [ -a | -o ] [ -t timeout ] { servicedir servicedir... } prog...
+ s6-svlisten [ -U | -u | -D | -d | -r | -R ] [ -a | -o ] [ -t timeout ] { servicedir servicedir... } prog...
@@ -42,7 +42,7 @@ a collection of supervised services, and blocks until they all go up, or down.
- s6-svlisten [ -U | -u | -D | -d ] [ -a | -o ] [ -t timeout ] servicedir servicedir... "" prog...
+ s6-svlisten [ -U | -u | -D | -d | -r | -R ] [ -a | -o ] [ -t timeout ] servicedir servicedir... "" prog...
@@ -73,6 +73,11 @@ See the explanation on this page.
services are down and the cleanup scripts in servicedir/finish
for every servicedir
have finished executing (or have timed out and been killed).
+ - -r : restart. s6-svlisten will wait until all
+the services have been started or restarted.
+ - -R : restart and ready. s6-svlisten will wait until
+all the services have been started or restarted and have notified
+readiness.
- -o : or. s6-svlisten will wait until one of the
given services comes up or down.
- -a : and. s6-svlisten will wait until all of the
@@ -100,6 +105,8 @@ to only use it in execline scripts (only the execline syntax is guaranteed
not to change). There is a variant of s6-svlisten that does not use execline
syntax, but only handles one service directory:
s6-svlisten1.
+ - The -R or -r options imply the -a option.
+It is not possible to wait for one of the listed services to restart.