From e4c6373b4fc55af346fc091fd9782326a00b9128 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sat, 21 Jan 2012 17:17:23 +0100 Subject: license docs were not properly redistributed thanks to Tomas Heinrich for alerting me. --- ChangeLog | 1 + Makefile.am | 2 ++ 2 files changed, 3 insertions(+) diff --git a/ChangeLog b/ChangeLog index 611127d6..a5a5fd6e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ Version 4.8.1 [v4-stable], 2011-09-?? - added doc for omprog - FQDN hostname for multihomed host was not always set to the correct name if multiple aliases existed. Thanks to Tomas Heinreich for the patch. +- re-licensed larger parts of the codebase under the Apache license 2.0 --------------------------------------------------------------------------- Version 4.8.0 [v4-stable] (rgerhards), 2011-09-07 *************************************************************************** diff --git a/Makefile.am b/Makefile.am index 111756f6..2aa2c398 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,7 +44,9 @@ EXTRA_DIST = \ slackware/rc.rsyslogd \ contrib/README \ rsyslog.conf \ + COPYING \ COPYING.LESSER \ + COPYING.ASL20 \ contrib/gnutls/ca.pem \ contrib/gnutls/cert.pem \ contrib/gnutls/key.pem -- cgit From b029d4751ac77f7ee4c7035c522e6c85601035c1 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Sat, 21 Jan 2012 17:18:49 +0100 Subject: mentioning license change in ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index d95d16f3..eca954a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ Version 5.8.7 [V5-stable] 2012-01-17 - bugfix: stats counter were not properly initialized on creation - FQDN hostname for multihomed host was not always set to the correct name if multiple aliases existed. Thanks to Tomas Heinreich for the patch. +- re-licensed larger parts of the codebase under the Apache license 2.0 --------------------------------------------------------------------------- Version 5.8.6 [V5-stable] 2011-10-21 - bugfix: missing whitespace after property-based filter was not detected -- cgit From c129ddcc637875442dbf9e0869f5eafbd08199ae Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 27 Jan 2012 11:08:58 +0100 Subject: bugfix: action stats did invalidly contain already-discarded messages --- action.c | 7 ++++--- configure.ac | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/action.c b/action.c index 7226e7d6..f16146c1 100644 --- a/action.c +++ b/action.c @@ -1575,7 +1575,8 @@ countStatsBatchEnq(action_t *pAction, batch_t *pBatch) { int i; for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) { - if(pBatch->pElem[i].bFilterOK) { + if( pBatch->pElem[i].bFilterOK + && pBatch->pElem[i].state != BATCH_STATE_DISC) { STATSCOUNTER_INC(pAction->ctrProcessed, pAction->mutCtrProcessed); } } @@ -1617,7 +1618,7 @@ doQueueEnqObjDirectBatch(action_t *pAction, batch_t *pBatch) pBatch->pElem[i].bFilterOK = 0; bModifiedFilter = 1; } - if(pBatch->pElem[i].bFilterOK) { + if(pBatch->pElem[i].bFilterOK && pBatch->pElem[i].state != BATCH_STATE_DISC) { STATSCOUNTER_INC(pAction->ctrProcessed, pAction->mutCtrProcessed); bNeedSubmit = 1; } @@ -1629,7 +1630,7 @@ doQueueEnqObjDirectBatch(action_t *pAction, batch_t *pBatch) /* note: stats were already computed above */ iRet = qqueueEnqObjDirectBatch(pAction->pQueue, pBatch); } else { - DBGPRINTF("no need to submit batch, all bFilterOK==0\n"); + DBGPRINTF("no need to submit batch, all bFilterOK==0 or discarded\n"); } if(bModifiedFilter) { for(i = 0 ; i < batchNumMsgs(pBatch) ; ++i) { diff --git a/configure.ac b/configure.ac index 0e9240e5..c6d775af 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([rsyslog],[5.8.6-newstats5],[rsyslog@lists.adiscon.com]) +AC_INIT([rsyslog],[5.8.6-newstats6],[rsyslog@lists.adiscon.com]) AM_INIT_AUTOMAKE m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -- cgit