summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-01-27 11:25:59 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2012-01-27 11:25:59 +0100
commitfdcf69caf9754a2d7464856fb90e634a6be9d65e (patch)
treec89c6650af3170d9a92831132bd99d75fb511cf8
parentcca05921dcfab557a4743a56c78683e4c1113e2a (diff)
parentc129ddcc637875442dbf9e0869f5eafbd08199ae (diff)
downloadrsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.gz
rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.tar.xz
rsyslog-fdcf69caf9754a2d7464856fb90e634a6be9d65e.zip
Merge branch 'v5-stable-newstats' into v5-devel
Conflicts: configure.ac
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am2
-rw-r--r--action.c7
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fe8ae053..87a7cac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -131,6 +131,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
@@ -987,6 +988,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 fd348a67..7cc1b65c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,7 +60,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 \
diff --git a/action.c b/action.c
index 34ca4fc0..9306ae0e 100644
--- a/action.c
+++ b/action.c
@@ -1581,7 +1581,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);
}
}
@@ -1623,7 +1624,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;
}
@@ -1635,7 +1636,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) {