From 01c12e7ac7bd0c95099dbe299f049c59081e35bc Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 20 Mar 2018 18:21:19 +0000 Subject: Add s6-svdt, change default max tally to 100, add doc, prepare for 2.7.1.0 --- NEWS | 3 +- doc/index.html | 3 +- doc/s6-svdt.html | 70 +++++++++++++++++++++++++++++++++++++ doc/servicedir.html | 2 +- doc/upgrade.html | 3 +- package/deps.mak | 3 ++ package/info | 2 +- package/modes | 1 + package/targets.mak | 1 + src/supervision/deps-exe/s6-svdt | 2 ++ src/supervision/s6-supervise.c | 2 +- src/supervision/s6-svdt.c | 74 ++++++++++++++++++++++++++++++++++++++++ 12 files changed, 160 insertions(+), 6 deletions(-) create mode 100644 doc/s6-svdt.html create mode 100644 src/supervision/deps-exe/s6-svdt create mode 100644 src/supervision/s6-svdt.c diff --git a/NEWS b/NEWS index 1570e9b..0e1aa75 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,11 @@ Changelog for s6. -In 2.7.0.1 +In 2.7.1.0 ---------- - Bugfixes. - s6-svwait et al. now exit 102 instead of hanging if s6-supervise dies. + - New command: s6-svdt In 2.7.0.0 diff --git a/doc/index.html b/doc/index.html index cbc24ed..733e3ee 100644 --- a/doc/index.html +++ b/doc/index.html @@ -100,7 +100,7 @@ library.

Download

The current released version of s6 is 2.7.0.1.
The current released version of s6 is 2.7.1.0.
Alternatively, you can checkout a copy of the s6 git repository: @@ -156,6 +156,7 @@ a user interface to control those processes and monitor service states.
The s6-svlisten1 program
The s6-svlisten program
The s6-notifyoncheck program
The s6-svdt program

Daemontools-like utilities

diff --git a/doc/s6-svdt.html b/doc/s6-svdt.html new file mode 100644 index 0000000..bb78061 --- /dev/null +++ b/doc/s6-svdt.html @@ -0,0 +1,70 @@ + + + + + + s6: the s6-svdt program + + + + + + +

+s6
+Software
+skarnet.org +

+ +

The s6-svdt program

+ +

+s6-svstat prints the recorded death tally of a service, i.e. a list of the times +the process died, with the cause of death. +

+ +

Interface

+ +

+     s6-svdt [ -S | -s ] [ -n maxlines ] servicedir
+

+ +

+ s6-svdt prints the contents of the recorded death tally of the service being +currently supervised at the servicedir +service directory, then exits 0. +

+ +

+ For each recorded death, s6-svdt prints one line. This line contains the +following fields, separated with spaces: +

+ +

A TAI64N +timestamp .
The word "signal" if the death was caused by a signal, or the word +"exitcode" if the death was a normal exit.
The name of the signal that caused the death, or the exit code +of the process.

Options

-S : print signal names. This is the default.
-s : print signal numbers. The numerical value of the signal +will be printed instead of the signal name.
-n maxlines : limit the output to at most +the latest maxlines deaths.

Exit codes

0: success
100: wrong usage
111: system call failed

A fifodir named event. It is automatically created by s6-supervise if it does not exist. diff --git a/doc/upgrade.html b/doc/upgrade.html index c37ad15..10f139b 100644 --- a/doc/upgrade.html +++ b/doc/upgrade.html @@ -18,10 +18,11 @@
What has changed in s6
-
in 2.7.0.1
+
in 2.7.1.0
- skalibs dependency bumped to 2.6.4.0.
- New command: s6-svdt.
in 2.7.0.0
diff --git a/package/deps.mak b/package/deps.mak index ef1cb47..f74fc71 100644 --- a/package/deps.mak +++ b/package/deps.mak @@ -127,6 +127,7 @@ src/pipe-tools/s6-mkfifodir.o src/pipe-tools/s6-mkfifodir.lo: src/pipe-tools/s6- src/supervision/s6-notifyoncheck.o src/supervision/s6-notifyoncheck.lo: src/supervision/s6-notifyoncheck.c src/include/s6/ftrigr.h src/include/s6/s6-supervise.h src/supervision/s6-supervise.o src/supervision/s6-supervise.lo: src/supervision/s6-supervise.c src/include/s6/ftrigw.h src/include/s6/s6-supervise.h src/supervision/s6-svc.o src/supervision/s6-svc.lo: src/supervision/s6-svc.c src/include/s6/config.h src/include/s6/s6-supervise.h +src/supervision/s6-svdt.o src/supervision/s6-svdt.lo: src/supervision/s6-svdt.c src/include/s6/s6-supervise.h src/supervision/s6-svlisten.o src/supervision/s6-svlisten.lo: src/supervision/s6-svlisten.c src/supervision/s6-svlisten.h src/supervision/s6-svlisten1.o src/supervision/s6-svlisten1.lo: src/supervision/s6-svlisten1.c src/supervision/s6-svlisten.h src/supervision/s6-svok.o src/supervision/s6-svok.lo: src/supervision/s6-svok.c src/include/s6/s6-supervise.h @@ -248,6 +249,8 @@ s6-supervise: EXTRA_LIBS := ${TAINNOW_LIB} s6-supervise: src/supervision/s6-supervise.o ${LIBS6} -lskarnet s6-svc: EXTRA_LIBS := s6-svc: src/supervision/s6-svc.o ${LIBS6} -lskarnet +s6-svdt: EXTRA_LIBS := +s6-svdt: src/supervision/s6-svdt.o ${LIBS6} -lskarnet s6-svlisten: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB} s6-svlisten: src/supervision/s6-svlisten.o src/supervision/s6_svlisten_signal_handler.o src/supervision/s6_svlisten_loop.o ${LIBS6} -lexecline -lskarnet s6-svlisten1: EXTRA_LIBS := ${SOCKET_LIB} ${TAINNOW_LIB} ${SPAWN_LIB} diff --git a/package/info b/package/info index debd421..76c50e3 100644 --- a/package/info +++ b/package/info @@ -1,4 +1,4 @@ package=s6 -version=2.7.0.1 +version=2.7.1.0 category=admin package_macro_name=S6 diff --git a/package/modes b/package/modes index 830708c..9c3939c 100644 --- a/package/modes +++ b/package/modes @@ -14,6 +14,7 @@ s6-svc 0755 s6-svscanctl 0755 s6-svok 0755 s6-svstat 0755 +s6-svdt 0755 s6-svwait 0755 s6-svlisten1 0755 s6-svlisten 0755 diff --git a/package/targets.mak b/package/targets.mak index 74f34ca..50445bd 100644 --- a/package/targets.mak +++ b/package/targets.mak @@ -14,6 +14,7 @@ s6-svc \ s6-svscanctl \ s6-svok \ s6-svstat \ +s6-svdt \ s6-svwait \ s6-svlisten1 \ s6-svlisten \ diff --git a/src/supervision/deps-exe/s6-svdt b/src/supervision/deps-exe/s6-svdt new file mode 100644 index 0000000..08815d9 --- /dev/null +++ b/src/supervision/deps-exe/s6-svdt @@ -0,0 +1,2 @@ +${LIBS6} +-lskarnet diff --git a/src/supervision/s6-supervise.c b/src/supervision/s6-supervise.c index 00c2358..4696004 100644 --- a/src/supervision/s6-supervise.c +++ b/src/supervision/s6-supervise.c @@ -343,7 +343,7 @@ static int uplastup_z (void) { unsigned int n ; - if (!read_uint("max-death-tally", &n)) n = 20 ; + if (!read_uint("max-death-tally", &n)) n = 100 ; if (n > S6_MAX_DEATH_TALLY) n = S6_MAX_DEATH_TALLY ; if (n) { diff --git a/src/supervision/s6-svdt.c b/src/supervision/s6-svdt.c new file mode 100644 index 0000000..b204934 --- /dev/null +++ b/src/supervision/s6-svdt.c @@ -0,0 +1,74 @@ +/* ISC license. */ + +#include +#include +#include +#include +#include +#include +#include + +#define USAGE "s6-svdt [ -S | -s ] [ -n maxentries ] servicedir" +#define dieusage() strerr_dieusage(100, USAGE) +#define die1() strerr_diefu1sys(111, "write to stdout") + +int main (int argc, char const *const *argv) +{ + unsigned int n = S6_MAX_DEATH_TALLY ; + int num = 0 ; + PROG = "s6-svdt" ; + { + subgetopt_t l = SUBGETOPT_ZERO ; + for (;;) + { + int opt = subgetopt_r(argc, argv, "Ssn:", &l) ; + if (opt == -1) break ; + switch (opt) + { + case 'S' : num = 0 ; break ; + case 's' : num = 1 ; break ; + case 'n' : if (!uint0_scan(l.arg, &n)) dieusage() ; break ; + default : dieusage() ; + } + } + argc -= l.ind ; argv += l.ind ; + } + if (!argc) dieusage() ; + if (n > S6_MAX_DEATH_TALLY) n = S6_MAX_DEATH_TALLY ; + if (!n) return 0 ; + { + s6_dtally_t tab[n] ; + ssize_t r = s6_dtally_read(argv[0], tab, n) ; + if (r < 0) strerr_diefu2sys(111, "read death tally for service ", argv[0]) ; + for (size_t i = 0 ; i < r ; i++) + { + char fmt[TIMESTAMP + 1] ; + timestamp_fmt(fmt, &tab[i].stamp) ; + fmt[TIMESTAMP] = ' ' ; + if (buffer_put(buffer_1, fmt, TIMESTAMP + 1) < 0) die1() ; + if (tab[i].sig) + { + if (buffer_puts(buffer_1, "signal ") < 0) die1() ; + if (num) + { + char fmt[3] ; + if (buffer_put(buffer_1, fmt, uint_fmt(fmt, tab[i].sig)) < 0) die1() ; + } + else + { + if (buffer_puts(buffer_1, "SIG") < 0) die1() ; + if (buffer_puts(buffer_1, sig_name(tab[i].sig)) < 0) die1() ; + } + } + else + { + char fmt[3] ; + if (buffer_puts(buffer_1, "exitcode ") < 0) die1() ; + if (buffer_put(buffer_1, fmt, uint_fmt(fmt, tab[i].exitcode)) < 0) die1() ; + } + if (buffer_put(buffer_1, "\n", 1) < 0) die1() ; + } + } + if (!buffer_flush(buffer_1)) die1() ; + return 0 ; +} -- cgit v1.2.3

Download

Daemontools-like utilities

The s6-svdt program

Interface

Options

Exit codes

What has changed in s6

in 2.7.0.1

in 2.7.1.0

in 2.7.0.0