From a3cdeecf0033919e3b5a79c17c19b5ac98719256 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 20 Jul 2015 20:20:54 +0000 Subject: - Add timeout-finish support and "down-readiness" - LOTS of refactoring to make this work - Remove s6-notifywhenup - s6-supervise now rocks the casbah - rc for 2.2.0.0 --- doc/s6-svc.html | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'doc/s6-svc.html') diff --git a/doc/s6-svc.html b/doc/s6-svc.html index 2de8ba4..f21847a 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 [ -D | -U ] [ -T timeout ] [ -abqhkti12pcoduxO ] servicedir
+     s6-svc [ -wu | -wU | -wd | -wD ] [ -T timeout ] [ -abqhkti12pcoduxO ] servicedir

@@ -75,13 +75,20 @@ it. (in milliseconds) after which s6-svc will exit 1 with an error message if the service still hasn't reached the desired state. By default, the timeout is 0, which means that s6-svc will block indefinitely. -

  • -D : s6-svc will not exit until the service is down.
    • -
  • -U : s6-svc will not exit until the service is up and +
  • -wd : s6-svc will not exit until the service is down, +i.e. until the run process has died.
    • +
  • -wD : s6-svc will not exit until the service is down +and ready to be brought up, i.e. a possible finish script has +exited.
    • +
  • -wu : s6-svc will not exit until the service is up, +i.e. there is a process running the run executable.
    • +
  • -wU : s6-svc will not exit until the service is up and ready as notified by the daemon itself. If the service directory does not contain a notification-fd file to tell s6-supervise to accept readiness -notification, s6-svc will print a warning and ignore the command.
    • +notification, s6-svc will print a warning and act as if the -wu +option had been given instead.

    Usage examples

    @@ -100,12 +107,13 @@ the process represented by the /service/sshd service directory - typically the sshd server.

    -
     s6-svc -Dd /service/ftpd
    +
     s6-svc -wD -d /service/ftpd

    - Take down the ftpd server and block until the process is really down. + Take down the ftpd server and block until the process is down and +the finish script has completed.

    -
     s6-svc -Uu -T 5000 /service/ftpd
    +
     s6-svc -wU -T 5000 -u /service/ftpd

    Bring up the ftpd server and block until it has sent notification that it is ready. Exit 1 if it is still not ready after 5 seconds. @@ -123,10 +131,10 @@ process is s6-log, this triggers a log rotation.

  • s6-svc writes control commands into the servicedir/supervise/control FIFO. A s6-supervise process running on servicedir will be listening to this FIFO, and will read and interpret those commands.
    • -
  • When invoked with the -D or -U option, s6-svc executes into +
  • When invoked with one of the -w options, s6-svc executes into s6-svlisten1, which will listen to service state -changes and spawn another s6-svc instance (without the -D or -U -option) that will send the commands to the service. Any error message written during +changes and spawn another s6-svc instance (without the -w option) +that will send the commands to the service. Any error message written during the waiting period will mention it is being written by s6-svlisten1; this is normal.
    • -- cgit v1.2.3