From 48e01bf4154aedd635c77094ecb58858af2b4c3b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 25 Oct 2011 14:59:29 +0200 Subject: doc: imfile: clarified that empty lines are not processed --- doc/imfile.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/imfile.html b/doc/imfile.html index 89be3292..eb1a72a9 100644 --- a/doc/imfile.html +++ b/doc/imfile.html @@ -15,7 +15,9 @@ text file is a file consisting of printable characters with lines being delimited by LF.

The file is read line-by-line and any line read is passed to rsyslog's rule engine. The rule engine applies filter conditons and -selects which actions needs to be carried out.

+selects which actions needs to be carried out. Empty lines are not +processed, as they would result in empty syslog records. They are simply +ignored.

As new lines are written they are taken from the file and processed. Please note that this happens based on a polling interval and not immediately. The file monitor support file rotation. To fully -- cgit v1.2.3 From eae869a3a4f2ea4c3bf4f54a9b1b61f00fc24f38 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 3 Nov 2011 10:13:11 +0100 Subject: doc bugfix: typo in imgssapi doc --- doc/imgssapi.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/imgssapi.html b/doc/imgssapi.html index ec183fe7..dd90fec7 100644 --- a/doc/imgssapi.html +++ b/doc/imgssapi.html @@ -38,7 +38,7 @@ Sets the maximum number of sessions supported

This sets up a GSS server on port 1514 that also permits to receive plain tcp syslog messages (on the same port):

- @@ -47,8 +47,7 @@ $InputGSSServerPermitPlainTCP on

This documentation is part of the rsyslog project.
-Copyright © 2008 by Rainer -Gerhards and +Copyright © 2008-2011 by Rainer Gerhards and Adiscon. Released under the GNU GPL version 3 or higher.

-- cgit v1.2.3 From ffa6e3b9419e8794d6bba8a0ce5ade65cdcc9ccb Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Thu, 1 Dec 2011 11:18:49 +0100 Subject: bugfix: cosmetic: proper constant used instead of number in open call Signed-off-by: Rainer Gerhards --- ChangeLog | 1 + runtime/nsd_gtls.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2494a86b..d5f31a08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,6 @@ --------------------------------------------------------------------------- Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? +- bugfix: cosmetic proper constant used instead of number in open call - bugfix: timestamp was incorrectly calculated for timezones with minute offset closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 diff --git a/runtime/nsd_gtls.c b/runtime/nsd_gtls.c index 3a79a015..31e1e964 100644 --- a/runtime/nsd_gtls.c +++ b/runtime/nsd_gtls.c @@ -110,7 +110,7 @@ readFile(uchar *pszFile, gnutls_datum_t *pBuf) pBuf->data = NULL; - if((fd = open((char*)pszFile, 0)) == -1) { + if((fd = open((char*)pszFile, O_RDONLY)) == -1) { errmsg.LogError(0, RS_RET_FILE_NOT_FOUND, "can not read file '%s'", pszFile); ABORT_FINALIZE(RS_RET_FILE_NOT_FOUND); -- cgit v1.2.3 From 9859818eccb27a330537258d9149c7c5f32292f6 Mon Sep 17 00:00:00 2001 From: Tomas Heinrich Date: Thu, 1 Dec 2011 11:25:47 +0100 Subject: bugfix: action resume interval incorrectly handled, thus took longer to resume Signed-off-by: Rainer Gerhards --- ChangeLog | 4 +++- action.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5f31a08..cc718141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ --------------------------------------------------------------------------- Version 3.22.4 [v3-stable] (rgerhards), 2010-??-?? -- bugfix: cosmetic proper constant used instead of number in open call +- bugfix: action resume interval incorrectly handled, thus took longer to + resume +- bugfix: cosmetic: proper constant used instead of number in open call - bugfix: timestamp was incorrectly calculated for timezones with minute offset closes: http://bugzilla.adiscon.com/show_bug.cgi?id=271 diff --git a/action.c b/action.c index 5c5bdbe9..c071bd4b 100644 --- a/action.c +++ b/action.c @@ -355,7 +355,7 @@ static rsRetVal actionTryResume(action_t *pThis) ttNow = getActNow(pThis); /* cache "now" */ /* first check if it is time for a re-try */ - if(ttNow > pThis->ttResumeRtry) { + if(ttNow >= pThis->ttResumeRtry) { iRet = pThis->pMod->tryResume(pThis->pModData); if(iRet == RS_RET_SUSPENDED) { /* set new tryResume time */ -- cgit v1.2.3