runit

commit 939a24cf07163837a6d008fed226c4161e4d397f
parent afe96bafc16b50808d35dc9e1700fa9420f7cab6
Author: Gerrit Pape <pape@smarden.org>
Date:   Sun,  3 Apr 2005 09:21:47 +0000

  * svlogd.c: properly prefix log messages written to standard error with
    optional timestamp.
  * runsvctrl.c, svwaitdown.c, svwaitup.c: supervise not running -> runsv
    not running.
  * package/README: 2005.

Diffstat:
M
package/CHANGES
 | 
5
+++++
M
package/README
 | 
2
+-
M
src/runsvctrl.c
 | 
2
+-
M
src/svlogd.c
 | 
1
+
M
src/svwaitdown.c
 | 
4
++--
M
src/svwaitup.c
 | 
2
+-

6 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/package/CHANGES b/package/CHANGES
@@ -2,6 +2,11 @@
     shutdown program.
   * man/svlogd.8: svlogd doesn't decrease the number of log files in a log
     directory; with n0 don't remove any log files.
+  * svlogd.c: properly prefix log messages written to standard error with
+    optional timestamp.
+  * runsvctrl.c, svwaitdown.c, svwaitup.c: supervise not running -> runsv
+    not running.
+  * package/README: 2005.
 
 runit 1.2.1
 Sat, 15 Jan 2005 11:57:46 +0000
diff --git a/package/README b/package/README
@@ -1,3 +1,3 @@
-Copyright 2001-2004
+Copyright 2001-2005
 G. Pape
 http://smarden.org/runit/
diff --git a/src/runsvctrl.c b/src/runsvctrl.c
@@ -30,7 +30,7 @@ int ctrl(char *name, char c) {
 
   if ((fd =open_write("supervise/control")) == -1) {
     if (errno == error_nodevice)
-      warnx(name, "supervise not running.");
+      warnx(name, "runsv not running.");
     else
       warn(name, "unable to open supervise/control");
     return(-1);
diff --git a/src/svlogd.c b/src/svlogd.c
@@ -760,6 +760,7 @@ int main(int argc, const char **argv) {
       if (dir[i].fddir != -1) {
         if (dir[i].inst.len) logmatch(&dir[i]);
         if (dir[i].matcherr == 'e') {
+          if (timestamp) buffer_puts(buffer_2, stamp);
           buffer_put(buffer_2, line, linelen);
           if (linelen == linemax) buffer_puts(buffer_2, "...");
           buffer_put(buffer_2, "\n", 1); buffer_flush(buffer_2);
diff --git a/src/svwaitdown.c b/src/svwaitdown.c
@@ -89,7 +89,7 @@ int main(int argc, const char * const *argv) {
     }
     if ((fd =open_write("supervise/ok")) == -1) {
       if (errno == error_nodevice) {
-	if (verbose) strerr_warn3(INFO, *dir, ": supervise not running.", 0);
+	if (verbose) strerr_warn3(INFO, *dir, ": runsv not running.", 0);
 	dir++;
       }
       else
@@ -149,7 +149,7 @@ int main(int argc, const char * const *argv) {
 	if ((fd =open_write("supervise/control")) == -1) {
 	  if (errno == error_nodevice) {
 	    if (verbose)
-	      strerr_warn3(INFO, *dir, ": supervise not running.", 0);
+	      strerr_warn3(INFO, *dir, ": runsv not running.", 0);
 	    dir++;
 	  }
 	  else
diff --git a/src/svwaitup.c b/src/svwaitup.c
@@ -71,7 +71,7 @@ int main(int argc, const char * const *argv) {
     }
     if ((fd =open_write("supervise/ok")) == -1) {
       if (errno == error_nodevice)
-	warn(*dir, ": supervise not running.", 0);
+	warn(*dir, ": runsv not running.", 0);
       else
 	warn(*dir, ": unable to open supervise/ok: ", &strerr_sys);
       continue;