diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:47:16 +0100 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-01-27 11:47:16 +0100 |
commit | 3367446c0abfec6230c9f70277ddc7c7ecbacdf6 (patch) | |
tree | acc296899eb8da0f5671e04d0234bc10971ac0a4 | |
parent | b826c0d3c53bc9da7014d8e75f6e3db8853b7c19 (diff) | |
parent | 2227515764469d475d42d05ca7384cb227a8dce5 (diff) | |
download | rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.gz rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.tar.xz rsyslog-3367446c0abfec6230c9f70277ddc7c7ecbacdf6.zip |
Merge branch 'v5-devel'
Conflicts:
ChangeLog
configure.ac
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | action.c | 7 |
3 files changed, 11 insertions, 10 deletions
@@ -346,7 +346,9 @@ expected that interfaces, even new ones, break during the initial syslog plain tcp input plugin (NOT supporting TLS!) [ported from v4] --------------------------------------------------------------------------- -Version 5.9.6 [V5-DEVEL], 2012-??-?? +Version 5.9.5 [V5-DEVEL], 2012-01-27 +- improved impstats subsystem, added many new counters +- enhanced module loader to not rely on PATH_MAX - refactored imklog linux driver, now combined with BSD driver The Linux driver no longer supports outdated kernel symbol resolution, which was disabled by default for very long. Also overall cleanup, @@ -360,12 +362,6 @@ Version 5.9.6 [V5-DEVEL], 2012-??-?? many unnamed others who already had complained at the time Chris made the suggestion ;-) --------------------------------------------------------------------------- -Version 5.9.5 [V5-DEVEL], 2011-11-29 -- new stats counters for imudp and imtcp -- new stats counters "discarded.nf" and "discarded.full" for queue object. - Tells how many messages have been discarded due to queue full condition. -- enhanced module loader to not rely on PATH_MAX ---------------------------------------------------------------------------- Version 5.9.4 [V5-DEVEL], 2011-11-29 - imuxsock: added capability to "annotate" messages with "trusted information", which contains some properties obtained from the system @@ -478,6 +474,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 @@ -1334,6 +1331,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 ff8a0e86..9c77807d 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 \ @@ -1654,7 +1654,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); } } @@ -1696,7 +1697,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; } @@ -1708,7 +1709,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) { |