diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 11:19:22 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 11:19:22 +0200 |
commit | 3806643baa9fe0d50fb36080e4ab3a078b8a5952 (patch) | |
tree | 0b84bbf8bf69aede6481b04799f93997c90995a5 /tools/syslogd.c | |
parent | 1577b76e37eff9aa1dc542390223ac42539fbbbf (diff) | |
download | rsyslog-3806643baa9fe0d50fb36080e4ab3a078b8a5952.tar.gz rsyslog-3806643baa9fe0d50fb36080e4ab3a078b8a5952.tar.bz2 rsyslog-3806643baa9fe0d50fb36080e4ab3a078b8a5952.zip |
ratelimiter: enable thread-safe mode & (related) API changes
Diffstat (limited to 'tools/syslogd.c')
-rw-r--r-- | tools/syslogd.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index 1eac6ccb..a56cea94 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -700,38 +700,6 @@ multiSubmitMsg(multi_submit_t *pMultiSub) /* backward compat. level */ } -/* add a message to a multisubmit structure. This handles ratelimiting. IF - * pMultiSub == NULL, a single-message enqueue happens. */ -rsRetVal -multiSubmitAddMsg(multi_submit_t *pMultiSub, msg_t *pMsg, ratelimit_t *ratelimit) -{ - rsRetVal localRet; - DEFiRet; - - if(pMultiSub == NULL) { -dbgprintf("DDDD: multiSubmitAddMsg, not checking ratelimiter for single submit!\n"); - CHKiRet(submitMsg(pMsg)); - } else { -dbgprintf("DDDD: have multisub!\n"); - localRet = ratelimitMsg(pMsg, ratelimit); - if(localRet == RS_RET_OK_HAVE_REPMSG) { -dbgprintf("DDDD: doing repeat submit!\n"); - pMultiSub->ppMsgs[pMultiSub->nElem++] = ratelimitGetRepeatMsg(ratelimit); - if(pMultiSub->nElem == pMultiSub->maxElem) - CHKiRet(multiSubmitMsg2(pMultiSub)); - localRet = RS_RET_OK; - } - if(localRet == RS_RET_OK) { - pMultiSub->ppMsgs[pMultiSub->nElem++] = pMsg; - if(pMultiSub->nElem == pMultiSub->maxElem) - CHKiRet(multiSubmitMsg2(pMultiSub)); - } - } - -finalize_it: - RETiRet; -} - /* flush multiSubmit, e.g. at end of read records */ rsRetVal multiSubmitFlush(multi_submit_t *pMultiSub) |