Improve s6-svc; prepare for 2.14.0.0

6 files changed, 74 insertions, 48 deletions

diff --git a/NEWS b/NEWS
index 58ea619..ee8eb51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,13 @@
 Changelog for s6.
 
-In 2.13.3.0
+In 2.14.0.0
 -----------
 
  - Bugfixes.
  - Support for shared libraries on MacOS.
  - New Rperiod directive for s6-log periodic rotations.
+ - s6-svc now accepts several service directory arguments.
+ - s6-svc now exits 102 on unsupervised directory argument.
 
 
 In 2.13.2.0
diff --git a/doc/index.html b/doc/index.html
index 83a345a..8d3ffa8 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -115,8 +115,8 @@ want nsswitch-like functionality:
 <h3> Download </h3>
 
 <ul>
- <li> The current released version of s6 is <a href="s6-2.13.3.0.tar.gz">2.13.3.0</a>.
-You can access its checksum <a href="s6-2.13.3.0.tar.gz.sha256">here</a>. </li>
+ <li> The current released version of s6 is <a href="s6-2.14.0.0.tar.gz">2.14.0.0</a>.
+You can access its checksum <a href="s6-2.14.0.0.tar.gz.sha256">here</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6/">s6
 git repository</a>:
diff --git a/doc/s6-svc.html b/doc/s6-svc.html
index de25dd0..0ade16c 100644
--- a/doc/s6-svc.html
+++ b/doc/s6-svc.html
@@ -28,14 +28,19 @@ knowing their PIDs, and without using horrible hacks such as .pid files.
 <h2> Interface </h2>
 
 <pre>
-     s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T <em>timeout</em> ] [ -s <em>signal</em> | -abqhkti12pcyrPCK ] [ -oduDUxO ] <em>servicedir</em>
+     s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T <em>timeout</em> ] [ -s <em>signal</em> | -abqhkti12pcyrPCK ] [ -oduDUxO ] <em>servicedirs...</em>
 </pre>
 
 <p>
 s6-svc sends the given series of commands to the
-<a href="s6-supervise.html">s6-supervise</a> process monitoring the
-<em>servicedir</em> directory, then exits 0. It exits 111 if it cannot send
-a command, or 100 if no s6-supervise process is running on <em>servicedir</em>.
+<a href="s6-supervise.html">s6-supervise</a> processes monitoring the
+<em>servicedirs</em> directories, then exits 0.
+</p>
+
+<p>
+ If an error occurs, s6-svc prints an error message and keeps processing
+<em>servicedirs</em>. It then exits with an error code corresponding to
+the last directory in <em>servicedir</em> that caused an error.
 </p>
 
 <h2> Options </h2>
@@ -124,43 +129,54 @@ started or restarted and has notified readiness. </li>
  <li> <tt>-K</tt>&nbsp;: send a SIGKILL to the <em>process group</em> of the supervised process </li>
 </ul>
 
+<h2> Exit codes </h2>
+
+<dl>
+ <dt> 0 </dt> <dd> Success. </dd>
+ <dt> 100 </dt> <dd> Usage error. </dd>
+ <dt> 102 </dt> <dd> One of the arguments in <em>servicedirs</em> is not a
+currently supervised service directory. </dd>
+ <dt> 111 </dt> <dd> System call failure. </ff>
+</dl>
+
 <h2> Usage examples </h2>
 
-<pre> s6-svc -h /service/httpd </pre>
+<pre> s6-svc -h /run/service/httpd </pre>
 <p>
- Send a SIGHUP to the process represented by the <tt>/service/httpd</tt>
+ Send a SIGHUP to the process represented by the <tt>/run/service/httpd</tt>
 service directory. Traditionally, this makes web servers reload their
 configuration file.
 </p>
 
-<pre> s6-svc -r /service/sshd </pre>
+<pre> s6-svc -r /run/service/sshd /run/service/httpd </pre>
 <p>
  Kill (and automatically restart, if the wanted state of the service is up)
-the process represented by the <tt>/service/sshd</tt> service directory -
-typically the sshd server.
+the process represented by the <tt>/run/service/sshd</tt> service directory
+&mdash; typically the sshd server &mdash; as well as the process represented
+by the <tt>/run/service/httpd</tt> directory &mdash; typically the Web server.
 </p>
 
-<pre> s6-svc -wD -d /service/ftpd </pre>
+<pre> s6-svc -wD -d /run/service/ftpd </pre>
 <p>
  Take down the ftpd server and block until the process is down and
 the finish script has completed.
 </p>
 
-<pre> s6-svc -wU -T 5000 -u /service/ftpd </pre>
+<pre> s6-svc -wU -T 5000 -u /run/service/ftpd </pre>
 <p>
  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.
 </p>
 
-<pre> s6-svc -wR -t /service/ftpd </pre>
+<pre> s6-svc -twR /run/service/ftpd /run/service/gitd </pre>
 <p>
- Send a SIGTERM to the ftpd server; wait for
-<a href="s6-supervise.html">s6-supervise</a> to restart it, and block
-until it has notified that it is ready to serve again. See the NOTES
-section below for a caveat.
+ Send a SIGTERM to the ftpd server and the git server; wait for their
+respective <a href="s6-supervise.html">supervisors</a> to restart them, and block
+until they both have notified that they are ready to serve again. See the NOTES
+section below.
 </p>
 
-<pre> s6-svc -a /service/httpd/log </pre>
+<pre> s6-svc -a /run/service/httpd/log </pre>
 <p>
  Send a SIGALRM to the logger process for the httpd server. If this logger
 process is <a href="s6-log.html">s6-log</a>, this triggers a log rotation.
@@ -169,32 +185,33 @@ process is <a href="s6-log.html">s6-log</a>, this triggers a log rotation.
 <h2> Internals </h2>
 
 <ul>
- <li> s6-svc writes control commands into the <tt><em>servicedir</em>/supervise/control</tt>
-FIFO. An s6-supervise process running on <em>servicedir</em> will be listening to this FIFO,
+ <li> s6-svc writes control commands into the <tt><em>x</em>/supervise/control</tt>
+FIFO for every service directory <em>x</em> listed in <em>servicedirs</em>.
+An s6-supervise process running on <em>x</em> will be listening to this FIFO,
 and will read and interpret those commands. </li>
  <li> When invoked with one of the <tt>-w</tt> options, s6-svc executes into
-<a href="s6-svlisten1.html">s6-svlisten1</a>, which will listen to service state
+<a href="s6-svlisten.html">s6-svlisten</a>, which will listen to service state
 changes and spawn another s6-svc instance (without the <tt>-w</tt> 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. </li>
+that will send the commands to the services. Any error message written during
+the waiting period will mention it is being written by s6-svlisten; this is normal. </li>
 </ul>
 
 <h2> Notes </h2>
 
 <ul>
  <li> The <tt>-t</tt> and <tt>-r</tt> options make <a href="s6-supervise.html">s6-supervise</a>
-send a signal to the service if it is up; but if the service is currently down,
+send a signal to the service it's supervisiing if it is up; but if the service is currently down,
 they do nothing, and in particular they do not instruct s6-supervise to bring the
-service up. Consequently, <tt>s6-svc -rwr <em>servicedir</em></tt> may wait forever
-for the service to be up, if it is currently wanted down. To avoid that, make sure
-your service is wanted up by using <tt>s6-svc -ruwr <em>servicedir</em></tt> instead. </li>
+service up. Consequently, <tt>s6-svc -rwr <em>servicedirs</em></tt> may wait forever
+for one of the services to be up, if it is currently wanted down. To avoid that, make sure
+your services are wanted up by using <tt>s6-svc -ruwr <em>servicedirs</em></tt> instead. </li>
  <li> The <tt>U</tt> and <tt>D</tt> letters, which convey the same idea as <tt>u</tt>
 and <tt>d</tt> (<em>up</em> and <em>down</em>) but with added emphasis, do not have the
 same meaning in the <tt>-U</tt>/<tt>-D</tt> and <tt>-wU</tt>/<tt>-wD</tt> options.
-In the <tt>-U</tt>/<tt>-D</tt> case, they mean "change the external service configuration
-to match what the supervisor has been instructed that the starting state of the service
-should be". In the <tt>-wU</tt>/<tt>-wD</tt> case, they mean "wait until the service
-has reached the wanted state <em>and also</em> is ready" (or "ready to be started again"
+In the <tt>-U</tt>/<tt>-D</tt> case, they mean "change the external service configurations
+to match what the supervisors have been instructed that the starting state of the services
+should be". In the <tt>-wU</tt>/<tt>-wD</tt> case, they mean "wait until the services
+havee reached the wanted state <em>and also</em> are ready" (or "ready to be started again"
 for <tt>-wD</tt>). The thing to remember is "it's up/down, with something more", but
 the "something" isn't the same. </li>
 </ul>
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 5aa07d1..5108256 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,7 +18,7 @@
 
 <h1> What has changed in s6 </h1>
 
-<h2> in 2.13.3.0 </h2>
+<h2> in 2.14.0.0 </h2>
 
 <ul>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
@@ -26,7 +26,7 @@ dependency bumped to 2.14.5.0. </li>
  <li> <a href="//skarnet.org/software/nsss/">nsss</a>
 optional dependency bumped to 0.2.1.1. </li>
  <li> <a href="//skarnet.org/software/execline/">execline</a>
-recommended dependency bumped to 2.9.7.1. </li>
+recommended dependency bumped to 2.9.8.0. </li>
 </ul>
 
 <h2> in 2.13.2.0 </h2>
diff --git a/package/info b/package/info
index 7a046ff..31f9e23 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6
-version=2.13.3.0
+version=2.14.0.0
 category=admin
 package_macro_name=S6
diff --git a/src/supervision/s6-svc.c b/src/supervision/s6-svc.c
index 40a2cd8..0c67dee 100644
--- a/src/supervision/s6-svc.c
+++ b/src/supervision/s6-svc.c
@@ -18,7 +18,7 @@
 #include <s6/config.h>
 #include <s6/supervise.h>
 
-#define USAGE "s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T timeout ] [ -s signal | -abqhkti12pcyrPCK ] [ -oduDUxOQ ] servicedir"
+#define USAGE "s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T timeout ] [ -s signal | -abqhkti12pcyrPCK ] [ -oduDUxOQ ] servicedirs..."
 #define dieusage() strerr_dieusage(100, USAGE)
 
 #define DATASIZE 63
@@ -103,7 +103,6 @@ int main (int argc, char const *const *argv)
     argc -= l.ind ; argv += l.ind ;
   }
   if (!argc) dieusage() ;
-  if (argc > 1) strerr_warnw1x("ignoring extra arguments") ;
   len = strlen(argv[0]) ;
   if (!len) strerr_dief1x(100, "invalid service path") ;
 
@@ -122,10 +121,10 @@ int main (int argc, char const *const *argv)
 
   if (updown[1])
   {
-    char const *newargv[11] ;
+    char const *newargv[6 + argc + (datalen > 1 ? 4 + argc : 0)] ;
     unsigned int m = 0 ;
     char fmt[UINT_FMT] ;
-    newargv[m++] = datalen > 1 ? S6_BINPREFIX "s6-svlisten1" : S6_BINPREFIX "s6-svwait" ;
+    newargv[m++] = datalen > 1 ? S6_BINPREFIX "s6-svlisten" : S6_BINPREFIX "s6-svwait" ;
     newargv[m++] = updown ;
     if (timeout)
     {
@@ -134,22 +133,30 @@ int main (int argc, char const *const *argv)
       newargv[m++] = fmt ;
     }
     newargv[m++] = "--" ;
-    newargv[m++] = argv[0] ;
+    for (unsigned int i = 0 ; i < argc ; i++) newargv[m++] = argv[i] ;
     if (datalen > 1)
     {
+      newargv[m++] = "" ;
       newargv[m++] = S6_BINPREFIX "s6-svc" ;
       newargv[m++] = data ;
       newargv[m++] = "--" ;
-      newargv[m++] = argv[0] ;
+      for (unsigned int i = 0 ; i < argc ; i++) newargv[m++] = argv[i] ;
     }
     newargv[m++] = 0 ;
-    xexec(newargv) ;
+    xmexec_n(newargv, "EXECLINE_STRICT", sizeof("EXECLINE_STRICT"), 1) ;
   }
-  else switch (s6_svc_writectl(argv[0], S6_SUPERVISE_CTLDIR, data + 1, datalen - 1))
+  else
   {
-    case -1 : strerr_diefu2sys(111, "control ", argv[0]) ;
-    case -2 : strerr_dief3sys(100, "something is wrong with the ", argv[0], "/" S6_SUPERVISE_CTLDIR " directory") ;
-    case 0 : strerr_diefu3x(100, "control ", argv[0], ": supervisor not listening") ;
+    int e = 0 ;
+    for (unsigned int i = 0 ; i < argc ; i++)
+    {
+      switch (s6_svc_writectl(argv[0], S6_SUPERVISE_CTLDIR, data + 1, datalen - 1))
+      {
+        case -1 : { strerr_warnwu2sys("control ", argv[i]) ; e = 111 ; break ; }
+        case -2 : { strerr_warnw3sys("something is wrong with the ", argv[i], "/" S6_SUPERVISE_CTLDIR " directory") ; e = 1 ; break ; }
+        case 0 : { strerr_warnwu3x("control ", argv[i], ": supervisor not listening") ; e = 102 ; break ; }
+      }
+    }
+    _exit(e) ;
   }
-  return 0 ;
 }