diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /runit | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'runit')
| -rw-r--r-- | runit/svlogd.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/runit/svlogd.c b/runit/svlogd.c index c3ff4e9c1..cfa20a773 100644 --- a/runit/svlogd.c +++ b/runit/svlogd.c | |||
| @@ -125,6 +125,23 @@ log message, you can use a pattern like this instead | |||
| 125 | -*: *: pid * | 125 | -*: *: pid * |
| 126 | */ | 126 | */ |
| 127 | 127 | ||
| 128 | //usage:#define svlogd_trivial_usage | ||
| 129 | //usage: "[-ttv] [-r C] [-R CHARS] [-l MATCHLEN] [-b BUFLEN] DIR..." | ||
| 130 | //usage:#define svlogd_full_usage "\n\n" | ||
| 131 | //usage: "Continuously read log data from stdin and write to rotated log files in DIRs" | ||
| 132 | //usage: "\n" | ||
| 133 | //usage: "\n""DIR/config file modifies behavior:" | ||
| 134 | //usage: "\n""sSIZE - when to rotate logs" | ||
| 135 | //usage: "\n""nNUM - number of files to retain" | ||
| 136 | /*usage: "\n""NNUM - min number files to retain" - confusing */ | ||
| 137 | /*usage: "\n""tSEC - rotate file if it get SEC seconds old" - confusing */ | ||
| 138 | //usage: "\n""!PROG - process rotated log with PROG" | ||
| 139 | /*usage: "\n""uIPADDR - send log over UDP" - unsupported */ | ||
| 140 | /*usage: "\n""UIPADDR - send log over UDP and DONT log" - unsupported */ | ||
| 141 | /*usage: "\n""pPFX - prefix each line with PFX" - unsupported */ | ||
| 142 | //usage: "\n""+,-PATTERN - (de)select line for logging" | ||
| 143 | //usage: "\n""E,ePATTERN - (de)select line for stderr" | ||
| 144 | |||
| 128 | #include <sys/poll.h> | 145 | #include <sys/poll.h> |
| 129 | #include <sys/file.h> | 146 | #include <sys/file.h> |
| 130 | #include "libbb.h" | 147 | #include "libbb.h" |