aboutsummaryrefslogtreecommitdiff
path: root/runit
diff options
context:
space:
mode:
authorGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-03 10:58:12 +0000
committerGravatar Denis Vlasenko <vda.linux@googlemail.com>2007-08-03 10:58:12 +0000
commitf223efbcde63c0c01e5b1331f2fc7f1a9c812f20 (patch)
treedc309c15cc447cd3d815d18e44fefb4534e6316b /runit
parent9a3b7b1db736c572ec8c2959daac148369a14cef (diff)
downloadbusybox-f223efbcde63c0c01e5b1331f2fc7f1a9c812f20.tar.gz
busybox-f223efbcde63c0c01e5b1331f2fc7f1a9c812f20.tar.bz2
svlogd: fix timestamping; do not warn if config is missing
sv: extend help text
Diffstat (limited to 'runit')
-rw-r--r--runit/sv.c6
-rw-r--r--runit/svlogd.c23
2 files changed, 13 insertions, 16 deletions
diff --git a/runit/sv.c b/runit/sv.c
index a918bb7bd..9181fff75 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -36,7 +36,7 @@ The sv program reports the current status and controls the state of services
monitored by the runsv(8) supervisor.
services consists of one or more arguments, each argument naming a directory
-service used by runsv(8). If service doesn?t start with a dot or slash,
+service used by runsv(8). If service doesn't start with a dot or slash,
it is searched in the default services directory /var/service/, otherwise
relative to the current directory.
@@ -72,6 +72,8 @@ exit
sv actually looks only at the first character of above commands.
+Commands compatible to LSB init script actions:
+
status
Same as status.
start
@@ -104,7 +106,7 @@ force-restart
7 seconds for the service to restart. Then report the status, and
on timeout send the service the kill command. If the script ./check
exists in the service directory, sv runs this script to check whether
- the service is up and available again; it?s considered to be available
+ the service is up and available again; it's considered to be available
if ./check exits with 0.
force-shutdown
Same as exit, but wait up to 7 seconds for the runsv(8) process to
diff --git a/runit/svlogd.c b/runit/svlogd.c
index b271b743f..e16043e44 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -465,8 +465,8 @@ static unsigned logdir_open(struct logdir *ld, const char *fn)
/* read config */
i = open_read_close("config", buf, sizeof(buf));
- if (i < 0)
- warn2("cannot read config", ld->name);
+ if (i < 0 && errno != ENOENT)
+ bb_perror_msg(WARNING": %s/config", ld->name);
if (i > 0) {
if (verbose) bb_error_msg(INFO"read: %s/config", ld->name);
s = buf;
@@ -835,19 +835,8 @@ int svlogd_main(int argc, char **argv)
char ch;
lineptr = line;
- taia_now(&now);
- /* Prepare timestamp if needed */
- if (timestamp) {
- switch (timestamp) {
- case 1:
- fmt_taia25(stamp, &now);
- break;
- default: /* case 2: */
- fmt_ptime30nul(stamp, &now);
- break;
- }
+ if (timestamp)
lineptr += 26;
- }
/* lineptr[0..linemax-1] - buffer for stdin */
/* (possibly has some unprocessed data from prev loop) */
@@ -857,6 +846,7 @@ int svlogd_main(int argc, char **argv)
if (!np && !exitasap) {
i = linemax - stdin_cnt; /* avail. bytes at tail */
if (i >= 128) {
+ taia_now(&now);
i = buffer_pread(0, lineptr + stdin_cnt, i, &now);
if (i <= 0) /* EOF or error on stdin */
exitasap = 1;
@@ -889,6 +879,11 @@ int svlogd_main(int argc, char **argv)
printlen = linelen;
printptr = lineptr;
if (timestamp) {
+ taia_now(&now);
+ if (timestamp == 1)
+ fmt_taia25(stamp, &now);
+ else /* 2: */
+ fmt_ptime30nul(stamp, &now);
printlen += 26;
printptr -= 26;
memcpy(printptr, stamp, 25);