diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-06-15 14:02:34 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-06-15 14:02:34 +0200 |
commit | 802f6d8a8f39e5ba578e0183e4500bef8e3a198c (patch) | |
tree | 6ebcee0347ee0f705edd0b1069bec3f49eb36060 /tools/syslogd.c | |
parent | fe8d317c1b40fe162891d5ddec1cb7df702bb7fe (diff) | |
download | rsyslog-802f6d8a8f39e5ba578e0183e4500bef8e3a198c.tar.gz rsyslog-802f6d8a8f39e5ba578e0183e4500bef8e3a198c.tar.xz rsyslog-802f6d8a8f39e5ba578e0183e4500bef8e3a198c.zip |
milestone(BUGGY): batch now pushed down to action
at least in important cases (not for non-direct action queues and some
other minor things). This version is definitely buggy, but may be tried
with success on a non-production system. I will continue to work on the
correctness, but needed to commit now to get a baseline.
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 46587a27..9b7b77ab 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -622,17 +622,6 @@ chkMsgAgainstACL() { #endif -/* consumes a single messages - this function is primarily used to shuffle - * out some code from msgConsumer(). After this function, the message is - * (by definition!) considered committed. - * rgerhards, 2009-11-16 - */ -///static inline rsRetVal -///msgConsumeOne(msg_t *pMsg, prop_t **propFromHost, prop_t **propFromHostIP) { - ///DEFiRet; - //////RETiRet; -///} - /* preprocess a batch of messages, that is ready them for actual processing. This is done * as a first stage and totally in parallel to any other worker active in the system. So * it helps us keep up the overall concurrency level. @@ -708,8 +697,8 @@ msgConsumer(void __attribute__((unused)) *notNeeded, batch_t *pBatch, int *pbShu assert(pBatch != NULL); pBatch->pbShutdownImmediate = pbShutdownImmediate; /* TODO: move this to batch creation! */ preprocessBatch(pBatch); +//pBatch->bSingleRuleset = 0; // TODO: testing aid, remove!!!! ruleset.ProcessBatch(pBatch); -dbgprintf("ZZZ: back in msgConsumer\n"); //TODO: the BATCH_STATE_COMM must be set somewhere down the road, but we //do not have this yet and so we emulate -- 2010-06-10 int i; |