summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2020-01-25 22:05:58 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2020-01-25 22:05:58 (GMT)
commit89b8439fc83ad8769b379e4a87ea35678ea57e7e (patch) (side-by-side diff)
tree363bd2dcb05f0852f8d58d945c84b73c5bd613e4
parent0cabe8d21e74d48317298ecb146b9e37f86267ad (diff)
downloadjumper-89b8439fc83ad8769b379e4a87ea35678ea57e7e.tar.gz
jumper-89b8439fc83ad8769b379e4a87ea35678ea57e7e.tar.bz2
Bugfix
* doc/jumper.8in: Document missing values * src/progman.c (progman_decommission): Call progman_cleanup on each iteration.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--doc/jumper.8in20
-rw-r--r--src/progman.c5
2 files changed, 16 insertions, 9 deletions
diff --git a/doc/jumper.8in b/doc/jumper.8in
index 00fdfc5..77c8cdc 100644
--- a/doc/jumper.8in
+++ b/doc/jumper.8in
@@ -14,7 +14,7 @@
.\" You should have received a copy of the GNU General Public License
.\" along with Jumper. If not, see <http://www.gnu.org/licenses/>.
.so config.so
-.TH JUMPER 8 "December 9, 2013" "JUMPER"
+.TH JUMPER 8 "January 25, 2020" "JUMPER"
.SH NAME
jumper \- bring up network links on demand
.SH SYNOPSIS
@@ -512,11 +512,14 @@ command (file name and line number separated with a colon).
.TP
.B JUMPER_EVENT
Name of the event that triggered the action; one of:
-.BR startup ,
.BR cleanup ,
.BR exit ,
-or
-.BR signal .
+.BR heartbeat ,
+.BR signal ,
+.BR startup .
+.BR
+.B JUMPER_PID
+PID of the running network management process.
.RE
.IP
The \fBenviron\fR statement allows for trimming the environment. Its
@@ -647,11 +650,11 @@ Line number in that file.
.TP
.B event
Name of the event that triggered the action; one of:
-.BR startup ,
.BR cleanup ,
.BR exit ,
-or
-.BR signal .
+.BR heartbeat ,
+.BR signal ,
+.BR startup .
.TP
.B status
Program termination status as returned by the
@@ -661,6 +664,9 @@ call.
.B exitcode
Exit code returned by the program, or the number of the signal that
caused its termination.
+.TP
+.B pid
+PID of the listener network management process.
.RE
.TP
\fBenviron\fR \fIENV\-SPEC\fR;
diff --git a/src/progman.c b/src/progman.c
index 1963676..ef5c73d 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -314,7 +314,7 @@ progman_cleanup(void)
are still running SHUTDOWN_TIMEOUT seconds after that, with SIGKILL.
*/
void
-progman_terminate()
+progman_terminate(void)
{
struct process *p;
time_t start;
@@ -344,7 +344,7 @@ progman_terminate()
}
void
-progman_decommission()
+progman_decommission(void)
{
struct process *p;
time_t start;
@@ -371,6 +371,7 @@ progman_decommission()
if (p->lp->decommission)
kill(p->pid, SIGKILL);
}
+ progman_cleanup();
listener_proc_report();
sleep(1);
count = 0;

Return to:

Send suggestions and report system problems to the System administrator.