From 01c12e7ac7bd0c95099dbe299f049c59081e35bc Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
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

---
 src/supervision/deps-exe/s6-svdt |  2 ++
 src/supervision/s6-supervise.c   |  2 +-
 src/supervision/s6-svdt.c        | 74 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 src/supervision/deps-exe/s6-svdt
 create mode 100644 src/supervision/s6-svdt.c

(limited to 'src')

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 <sys/types.h>
+#include <skalibs/types.h>
+#include <skalibs/buffer.h>
+#include <skalibs/strerr2.h>
+#include <skalibs/sgetopt.h>
+#include <skalibs/sig.h>
+#include <s6/s6-supervise.h>
+
+#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