From: Ben Pfaff <blp@nicira.com>
Date: Fri, 11 Oct 2013 23:52:50 +0000 (-0700)
Subject: daemon: Precisely document signals that cause the monitor to restart.
X-Git-Tag: sliver-openvswitch-2.0.90-1~6^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f67c329519d9a2773dcb1553da1f88be08ba016e;p=sliver-openvswitch.git

daemon: Precisely document signals that cause the monitor to restart.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Joe Stringer <joestringer@nicira.com>
---

diff --git a/lib/daemon.c b/lib/daemon.c
index 1c9ebe257..54641d078 100644
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -376,6 +376,8 @@ should_restart(int status)
 {
     if (WIFSIGNALED(status)) {
         static const int error_signals[] = {
+            /* This list of signals is documented in daemon.man.  If you
+             * change the list, update the documentation too. */
             SIGABRT, SIGALRM, SIGBUS, SIGFPE, SIGILL, SIGPIPE, SIGSEGV,
             SIGXCPU, SIGXFSZ
         };
diff --git a/lib/daemon.man b/lib/daemon.man
index 7b07cb81d..00de1a316 100644
--- a/lib/daemon.man
+++ b/lib/daemon.man
@@ -26,9 +26,10 @@ run as a background process. \*(DD
 \fB\-\-monitor\fR
 Creates an additional process to monitor the \fB\*(PN\fR daemon.  If
 the daemon dies due to a signal that indicates a programming error
-(e.g. \fBSIGSEGV\fR, \fBSIGABRT\fR), then the monitor process starts a
-new copy of it.  If the daemon die or exits for another reason, the
-monitor process exits.
+(\fBSIGABRT\fR, \fBSIGALRM\fR, \fBSIGBUS\fR, \fBSIGFPE\fR,
+\fBSIGILL\fR, \fBSIGPIPE\fR, \fBSIGSEGV\fR, \fBSIGXCPU\fR, or
+\fBSIGXFSZ\fR) then the monitor process starts a new copy of it.  If
+the daemon dies or exits for another reason, the monitor process exits.
 .IP
 This option is normally used with \fB\-\-detach\fR, but it also
 functions without it.