emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svlogd: fix compat problem: svlogd -tt should timestanp stderr too

Browse Source
This commit is contained in:
Denis Vlasenko 2007-10-22 15:53:34 +00:00
parent 78ee7c853a
commit 7ab5e3dfcd
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runit/svlogd.c
View File

@ -985,9 +985,11 @@ int svlogd_main(int argc, char **argv)
if (ld->fddir == -1) continue; if (ld->fddir == -1) continue;
if (ld->inst) if (ld->inst)
logmatch(ld); logmatch(ld);
if (ld->matcherr == 'e') if (ld->matcherr == 'e') {
/* runit-1.8.0 compat: if timestamping, do it on stderr too */
////full_write(2, printptr, printlen); ////full_write(2, printptr, printlen);
fwrite(lineptr, 1, linelen, stderr); fwrite(printptr, 1, printlen, stderr);
}
if (ld->match != '+') continue; if (ld->match != '+') continue;
buffer_pwrite(i, printptr, printlen); buffer_pwrite(i, printptr, printlen);
} }
@ -1012,9 +1014,10 @@ int svlogd_main(int argc, char **argv)
/* linelen == no of chars incl. '\n' (or == stdin_cnt) */ /* linelen == no of chars incl. '\n' (or == stdin_cnt) */
for (i = 0; i < dirn; ++i) { for (i = 0; i < dirn; ++i) {
if (dir[i].fddir == -1) continue; if (dir[i].fddir == -1) continue;
if (dir[i].matcherr == 'e') if (dir[i].matcherr == 'e') {
////full_write(2, lineptr, linelen); ////full_write(2, lineptr, linelen);
fwrite(lineptr, 1, linelen, stderr); fwrite(lineptr, 1, linelen, stderr);
}
if (dir[i].match != '+') continue; if (dir[i].match != '+') continue;
buffer_pwrite(i, lineptr, linelen); buffer_pwrite(i, lineptr, linelen);
} }