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

Disable logger default file rotation, must now be enabled with -r

Browse Source 
Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson 2019-10-30 09:30:42 +01:00
parent eb10b94f55
commit a1e5680aee
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/compat.h
View File

@ -116,7 +116,7 @@ static inline void parse_rotation(char *optarg, off_t *size, int *num)
sz = strtobytes(buf); sz = strtobytes(buf);
if (sz > 0) if (sz > 0)
*size = sz; *size = sz;
if (cnt) if (cnt > 0)
*num = cnt; *num = cnt;
} }

12
src/logger.c
View File

@ -115,6 +115,9 @@ static int checksz(FILE *fp, off_t sz)
{ {
struct stat st; struct stat st;
if (!fp)
return 0;
fsync(fileno(fp)); fsync(fileno(fp));
if (sz <= 0) if (sz <= 0)
return 0; return 0;
@ -177,14 +180,14 @@ static int usage(int code)
{ {
printf("Usage: logger [OPTIONS] [MESSAGE]\n" printf("Usage: logger [OPTIONS] [MESSAGE]\n"
"\n" "\n"
"Write MESSAGE (or stdin) to syslog, or file (with logrotate)\n" "Write MESSAGE (or line-by-line stdin) to syslog, or file (with logrotate).\n"
"\n" "\n"
" -p PRIO Log message priority (numeric or facility.severity pair)\n" " -p PRIO Log message priority (numeric or facility.severity pair)\n"
" -t TAG Log using the specified tag (defaults to user name)\n" " -t TAG Log using the specified tag (defaults to user name)\n"
" -s Log to stderr as well as the system log\n" " -s Log to stderr as well as the system log\n"
"\n" "\n"
" -f FILE Log file to write messages to, instead of syslog daemon\n" " -f FILE Log file to write messages to, instead of syslog daemon\n"
" -r S:R Log file rotation, default: 200 kB max \e[4ms\e[0mize, 5 \e[4mr\e[0motations\n" " -r S[:R] Enable log file rotation, default: 200 kB \e[4ms\e[0mize, 5 \e[4mr\e[0motations\n"
"\n" "\n"
" -? This help text\n" " -? This help text\n"
" -v Show program version\n" " -v Show program version\n"
@ -197,7 +200,7 @@ static int usage(int code)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
FILE *fp; FILE *fp = NULL;
int c, num = 5; int c, num = 5;
int facility = LOG_USER; int facility = LOG_USER;
int severity = LOG_INFO; int severity = LOG_INFO;
@ -221,6 +224,8 @@ int main(int argc, char *argv[])
case 'r': case 'r':
parse_rotation(optarg, &size, &num); parse_rotation(optarg, &size, &num);
if (size > 0 && num > 0)
rotate = 1;
break; break;
case 's': case 's':
@ -265,7 +270,6 @@ int main(int argc, char *argv[])
fp = fopen(logfile, "a"); fp = fopen(logfile, "a");
if (!fp) if (!fp)
err(1, "Failed opening %s for writing: %m", logfile); err(1, "Failed opening %s for writing: %m", logfile);
rotate = 1;
} else { } else {
log_opts |= LOG_STDOUT; log_opts |= LOG_STDOUT;
fp = stdout; fp = stdout;