about summary refs log tree commit diff
path: root/doc/s6-svc.html
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2018-06-15 12:36:00 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2018-06-15 12:36:00 +0000
commit50a00de6e4aa6337b17a179019ec7689a2cc6b6d (patch)
tree64436fc16abf67e0880c22231a58a12ef06d8469 /doc/s6-svc.html
parent6577467acca3fd281273b95c3906a85dbf19e6f8 (diff)
downloads6-50a00de6e4aa6337b17a179019ec7689a2cc6b6d.tar.gz
s6-50a00de6e4aa6337b17a179019ec7689a2cc6b6d.tar.xz
s6-50a00de6e4aa6337b17a179019ec7689a2cc6b6d.zip
Down signal customization: add ./down-signal file and s6-svc -r
Diffstat (limited to 'doc/s6-svc.html')
-rw-r--r--doc/s6-svc.html14
1 files changed, 11 insertions, 3 deletions
diff --git a/doc/s6-svc.html b/doc/s6-svc.html
index 22a4f68..c1e617f 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.
 <h2> Interface </h2>
 
 <pre>
-     s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T <em>timeout</em> ] [ -abqhkti12pcyoduxO ] <em>servicedir</em>
+     s6-svc [ -wu | -wU | -wd | -wD | -wr | -wR ] [ -T <em>timeout</em> ] [ -abqhkti12pcyoduxOr ] <em>servicedir</em>
 </pre>
 
 <p>
@@ -55,7 +55,10 @@ a command, or 100 if no s6-supervise process is running on <em>servicedir</em>.
  <li> <tt>-y</tt>&nbsp;: send a SIGWINCH to the supervised process </li>
  <li> <tt>-o</tt>&nbsp;: once. Equivalent to "-uO". </li>
  <li> <tt>-d</tt>&nbsp;: down. If the supervised process is up, send it
-a SIGTERM and a SIGCONT. Do not restart it. </li>
+a SIGTERM (by default) then a SIGCONT (to make sure even stopped processes
+receive the signal aimed to kill them) and do not restart it.
+The SIGTERM default can be changed by editing the <tt>./down-signal</tt>
+file in the <a href="servicedir.html">service directory</a>. </li>
  <li> <tt>-u</tt>&nbsp;: up. If the supervised process is down, start it.
 Automatically restart it when it dies. </li>
  <li> <tt>-x</tt>&nbsp;: exit. When the service is asked to be down and
@@ -71,6 +74,11 @@ stdin, stdout and stderr redirected to <tt>/dev/null</tt>. </li>
  <li> <tt>-O</tt>&nbsp;: mark the service to run once at most. iow: do not
 restart the supervised process when it dies. If it is down when the command
 is received, do not even start it. </li>
+ <li> <tt>-r</tt>&nbsp;: If the service is up, restart it, by sending it a
+signal to kill it and letting <a href="s6-supervise.html">s6-supervise</a>
+start it again. By default, the signal is a SIGTERM; this can be configured
+via the <tt>./down-signal</tt> file in the <a href="servicedir.html">service
+directory</a>. </li>
  <li> <tt>-T&nbsp;<em>timeout</em></tt>&nbsp;: if the <tt>-w<em>state</em></tt>
 option has been given, <tt>-T</tt> specifies a timeout
 (in milliseconds) after which s6-svc will exit 1 with an error message if
@@ -106,7 +114,7 @@ service directory. Traditionally, this makes web servers reload their
 configuration file.
 </p>
 
-<pre> s6-svc -t /service/sshd </pre>
+<pre> s6-svc -r /service/sshd </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 -