runit: checks for pid == 1

new: svwaitdown, svwaitup
stage3: uses svwaitdown
0.2.2
debian package

1 files changed, 131 insertions, 0 deletions

diff --git a/src/svwaitdown.c b/src/svwaitdown.c
new file mode 100644
index 0000000..9c3ef8a
--- /dev/null
+++ b/src/svwaitdown.c
@@ -0,0 +1,131 @@
+/*
+  in /package/admin/daemontools/compile/ :
+  gcc -Wall -c svwaitdown.c && \
+    gcc -o svwaitdown svwaitdown.o unix.a byte.a time.a
+
+  Gerrit Pape <pape@smarden.org>
+*/
+
+#include <unistd.h>
+#include "strerr.h"
+#include "error.h"
+#include "sgetopt.h"
+#include "scan.h"
+#include "open.h"
+#include "tai.h"
+#include "buffer.h"
+
+#define FATAL "svwaitdown: fatal: "
+#define WARNING "svwaitdown: warning: "
+#define INFO "svwaitdown: info: "
+#define USAGE " [ -v ] [ -t 2..6000 ] service ..."
+
+const char *progname;
+const char * const *dir;
+unsigned int rc;
+
+void usage () {
+  strerr_die4x(1, "usage: ", progname, USAGE, "\n");
+}
+
+void warn (const char *s1, const char *s2, struct strerr *e) {
+  dir++;
+  rc++;
+  strerr_warn3(WARNING, s1, s2, e);
+}
+
+int main (int argc, const char * const *argv) {
+  int opt;
+  unsigned long sec =600;
+  int verbose =0;
+  int fd;
+  char status[18];
+  int r;
+  unsigned long pid;
+  struct tai start;
+  struct tai now;
+  
+  progname =*argv;
+  
+  while ((opt =getopt(argc, argv, "t:vV")) != opteof) {
+    switch(opt) {
+    case 't':
+      scan_ulong(optarg, &sec);
+      if ((sec < 2) || (sec > 600)) {
+	usage();
+      }
+      break;
+    case 'v':
+      verbose =1;
+      break;
+    case 'V':
+      strerr_warn1("$Id", 0);
+    case '?':
+      usage();
+    }
+  }
+  argv +=optind;
+  if (! argv || ! *argv) {
+    usage();
+  }
+
+  dir =argv;
+  tai_now(&start);
+  
+  while (*dir) {
+    if (chdir(*dir) == -1) {
+      warn(*dir, ": unable to change directory: ", &strerr_sys);
+      continue;
+    }
+    
+    fd = open_write("supervise/ok");
+    if (fd == -1) {
+      if (errno == error_nodevice) {
+	if (verbose) strerr_warn3(INFO, *dir, ": supervise not running.", 0);
+	dir++;
+      }
+      else
+	warn(*dir, ": unable to open supervise/ok: ", &strerr_sys);
+      continue;
+    }
+    close(fd);
+
+    fd = open_read("supervise/status");
+    if (fd == -1) {
+      warn(*dir, "unable to open supervise/status: ", &strerr_sys);
+      continue;
+    }
+    r = buffer_unixread(fd, status, sizeof status);
+    close(fd);
+    if (r < sizeof status) {
+      if (r == -1)
+	warn(*dir, "unable to read supervise/status: ", &strerr_sys);
+      else
+	warn(*dir, ": unable to read supervise/status: bad format.", 0);
+      continue;
+    }
+  
+    pid = (unsigned char) status[15];
+    pid <<= 8; pid += (unsigned char) status[14];
+    pid <<= 8; pid += (unsigned char) status[13];
+    pid <<= 8; pid += (unsigned char) status[12];
+    if (! pid) {
+      /* ok, service is down */
+      if (verbose) strerr_warn3(INFO, *dir, ": down.", 0);
+      dir++;
+      continue;
+    }
+
+    tai_now(&now);
+    tai_sub(&now, &now, &start);
+    if (tai_approx(&now) >= sec) {
+      /* timeout */
+      if (verbose) strerr_warn2(INFO, "timeout.", 0);
+      exit(111);
+    }
+
+    sleep(1);
+  }
+  if (rc > 100) rc =100;
+  exit(rc);
+}