diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | runtime/conf.c | 6 | ||||
| -rw-r--r-- | tools/rsyslogd.8 | 8 |
3 files changed, 14 insertions, 4 deletions
@@ -110,11 +110,13 @@ Version 3.21.0 [DEVEL] (rgerhards), 2008-07-18 - imported all changes from 3.18.1 until today (some quite important, see below) --------------------------------------------------------------------------- -Version 3.19.12 [BETA] (rgerhards), 2008-08-25 +Version 3.19.12 [BETA] (rgerhards), 2008-10-16 - bugfix: subseconds where not correctly extracted from a timestamp if that timestamp did not contain any subsecond information (the resulting string was garbagge but should have been "0", what it now is). +- increased maximum size of a configuration statement to 4K (was 1K) +- imported all fixes from the stable branch (quite a lot) --------------------------------------------------------------------------- Version 3.19.11 [BETA] (rgerhards), 2008-08-25 This is a refresh of the beta. No beta-specific fixes have been added. diff --git a/runtime/conf.c b/runtime/conf.c index e55b8d18..f71d5669 100644 --- a/runtime/conf.c +++ b/runtime/conf.c @@ -31,7 +31,7 @@ * * A copy of the GPL can be found in the file "COPYING" in this distribution. */ - +#define CFGLNSIZ 4096 /* the maximum size of a configuraton file line, after re-combination */ #include "config.h" #include <stdlib.h> #include <stdio.h> @@ -392,7 +392,7 @@ processConfFile(uchar *pConfFile) FILE *cf; selector_t *fCurr = NULL; uchar *p; - uchar cbuf[BUFSIZ]; + uchar cbuf[CFGLNSIZ]; uchar *cline; int i; ASSERT(pConfFile != NULL); @@ -432,7 +432,7 @@ processConfFile(uchar *pConfFile) for (p = (uchar*) strchr((char*)cline, '\0'); isspace((int) *--p);) /*EMPTY*/; if (*p == '\\') { - if ((p - cbuf) > BUFSIZ - 30) { + if ((p - cbuf) > CFGLNSIZ - 30) { /* Oops the buffer is full - what now? */ cline = cbuf; } else { diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 05905412..86c4bf66 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -254,6 +254,14 @@ configuration file (default is will be reread and the .BR rsyslog (3) facility is started again. +Note that this means a full rsyslogd restart is done. This has, among others, +the consequence that TCP and other connections are torn down. Also, if any +queues are not running in disk assisted mode or are not set to persist data +on shutdown, queue data is lost. HUPing rsyslogd is an extremely expensive +operation and should only be done when actually necessary. Actually, it is +a rsyslgod stop immediately followed by a restart. Future versions will probably +include a special handling which only closes files, but will not cause any +of the other effects. .TP .B TERM ", " INT ", " QUIT .B Rsyslogd |