From 83360a6841ce7b3d28d26fde98d9ef4f03b1e229 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 16 Oct 2008 14:23:14 +0200 Subject: increased maximum size of a configuration statement to 4K (was 1K) --- ChangeLog | 4 +++- runtime/conf.c | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index db47f415..d4ddca1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,11 @@ --------------------------------------------------------------------------- -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 71b2b2da..75276a00 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 #include @@ -382,7 +382,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); @@ -422,7 +422,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 { -- cgit From 11e2d2c3bede67cc09580269fcc45d2f3e604eba Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 16 Oct 2008 14:30:56 +0200 Subject: clarified cost and effect of SIGHUP --- tools/rsyslogd.8 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/rsyslogd.8 b/tools/rsyslogd.8 index 91f2016e..fd7a5377 100644 --- a/tools/rsyslogd.8 +++ b/tools/rsyslogd.8 @@ -223,6 +223,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 -- cgit