← Back to branch summary

~ubuntu-branches/ubuntu/precise/rsyslog/precise

« back to all changes in this revision

Viewing changes to runtime/rule.c

  • Committer: Package Import Robot
  • Author(s): Scott Moser
  • Date: 2011-11-07 13:54:56 UTC
  • mfrom: (16.1.25 sid)
  • Revision ID: package-import@ubuntu.com-20111107135456-cwt6mu19ski1h2qf
Tags: 5.8.6-1ubuntu1
* Resynchronise with Debian. Remaining changes:
  - Run as rsyslog:rsyslog, set $FileOwner to syslog
  - Replace init script with debian/rsyslog.upstart.
  - debian/rsyslog.logrotate: Use reload command to restart rsyslog
  - debian/rsyslog.conf: enable $RepeatedMsgReduction 
    to avoid bloating the syslog file (LP #453444)
  - Add debian/rsyslog.dmesg.upstart to save initial dmesg into a file.
    Install it in debian/rules.
  - debian/50-default.conf: set of default rules for syslog (forwarded to
    Debian #603160). remove file in postrm on purge. manage with ucf.
  - debian/rules: build with LDFLAGS=""
* Dropped:
  - debian/patches/02-CVE-2011-3200.patch (fixed in upstream release)

Show diffs side-by-side

added added

removed removed

Lines of Context:
runtime/rule.c
266
266
processBatch(rule_t *pThis, batch_t *pBatch)
267
267
{
268
268
        int i;
 
269
        rsRetVal localRet;
269
270
        DEFiRet;
270
271
 
271
272
        ISOBJ_TYPE_assert(pThis, rule);
273
274
 
274
275
        /* first check the filters and reset status variables */
275
276
        for(i = 0 ; i < batchNumMsgs(pBatch) && !*(pBatch->pbShutdownImmediate) ; ++i) {
276
 
                CHKiRet(shouldProcessThisMessage(pThis, (msg_t*)(pBatch->pElem[i].pUsrp),
277
 
                                                 &(pBatch->pElem[i].bFilterOK)));
278
 
                // TODO: really abort on error? 2010-06-10
 
277
                localRet = shouldProcessThisMessage(pThis, (msg_t*)(pBatch->pElem[i].pUsrp),
 
278
                                                    &(pBatch->pElem[i].bFilterOK));
 
279
                if(localRet != RS_RET_OK) {
 
280
                        DBGPRINTF("processBatch: iRet %d returned from shouldProcessThisMessage, "
 
281
                                  "ignoring message\n", localRet);
 
282
                        pBatch->pElem[i].bFilterOK = 0;
 
283
                }
279
284
                if(pBatch->pElem[i].bFilterOK) {
280
285
                        /* re-init only when actually needed (cache write cost!) */
281
286
                        pBatch->pElem[i].bPrevWasSuspended = 0;