From: Jim Jagielski Date: Fri, 14 Jun 2013 17:37:51 +0000 (+0000) Subject: +1 if we bump X-Git-Tag: 2.4.5~113 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf1ea6870db99d495f81a46520e3875803834380;p=apache +1 if we bump git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1493180 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 5b3414100e..7b5f152e2b 100644 --- a/STATUS +++ b/STATUS @@ -179,7 +179,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: sf: Because it is only annoying and serves no purpose anymore. If you want, we can make it a minor MMN bump for adding a "new" API. +1: sf, covener - -1: nd, jim + -1: nd, jim (+1 iff we do a MMN bump) * mod_cache_socache: Make sure the CacheSocacheMaxSize directive is merged correctly. diff --git a/docs/man/rotatelogs.8 b/docs/man/rotatelogs.8 index 407af8e3c1..a793475af4 100644 --- a/docs/man/rotatelogs.8 +++ b/docs/man/rotatelogs.8 @@ -19,7 +19,7 @@ .el .ne 3 .IP "\\$1" \\$2 .. -.TH "ROTATELOGS" 8 "2011-10-28" "Apache HTTP Server" "rotatelogs" +.TH "ROTATELOGS" 8 "2013-06-13" "Apache HTTP Server" "rotatelogs" .SH NAME rotatelogs \- Piped logging program to rotate Apache logs @@ -27,7 +27,7 @@ rotatelogs \- Piped logging program to rotate Apache logs .SH "SYNOPSIS" .PP -\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR \fIprogram\fR ] [ -\fBf\fR ] [ -\fBv\fR ] [ -\fBe\fR ] [ -\fBc\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ] +\fBrotatelogs\fR [ -\fBl\fR ] [ -\fBL\fR \fIlinkname\fR ] [ -\fBp\fR \fIprogram\fR ] [ -\fBf\fR ] [ -\fBv\fR ] [ -\fBe\fR ] [ -\fBc\fR ] [ -\fBn\fR \fInumber-of-files\fR ] \fIlogfile\fR \fIrotationtime\fR|\fIfilesize\fR(B|K|M|G) [ \fIoffset\fR ] .SH "SUMMARY" @@ -64,6 +64,9 @@ Echo logs through to stdout\&. Useful when logs need to be further processed in -c Create log file for each interval, even if empty\&. .TP +-n \fInumber-of-files\fR +Use a circular list of filenames without timestamps\&. With -n 3, the series of log files opened would be "logfile", "logfile\&.1", "logfile\&.2", then overwriting "logfile"\&. +.TP \fIlogfile\fR .PP The path plus basename of the logfile\&. If \fIlogfile\fR includes any '%' characters, it is treated as a format string for strftime(3)\&. Otherwise, the suffix \fI\&.nnnnnnnnnn\fR is automatically added and is the time in seconds (unless the -t option is used)\&. Both formats compute the start time from the beginning of the current period\&. For example, if a rotation time of 86400 is specified, the hour, minute, and second fields created from the strftime(3) format will all be zero, referring to the beginning of the current 24-hour period (midnight)\&. .PP When using strftime(3) filename formatting, be sure the log file format has enough granularity to produce a different file name each time the logs are rotated\&. Otherwise rotation will overwrite the same file instead of starting a new one\&. For example, if \fIlogfile\fR was /var/logs/errorlog\&.%Y-%m-%d with log rotation at 5 megabytes, but 5 megabytes was reached twice in the same day, the same log file name would be produced and log rotation would keep writing to the same file\&. .TP