diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:09:37 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-15 12:09:37 +0200 |
| commit | 0d60901e6e404419b06ad0d20429edf7ea3053ce (patch) | |
| tree | bffb9ab667312a0e142ba8746b3ec3f3030f50f7 /tcps_sess.c | |
| parent | 25a8496a6ae79480e8601cbdab5b45ad613a8dcd (diff) | |
| download | rsyslog-0d60901e6e404419b06ad0d20429edf7ea3053ce.tar.gz rsyslog-0d60901e6e404419b06ad0d20429edf7ea3053ce.tar.bz2 rsyslog-0d60901e6e404419b06ad0d20429edf7ea3053ce.zip | |
ratelimit: imtcp (and gssapi) converted to new interface
Diffstat (limited to 'tcps_sess.c')
| -rw-r--r-- | tcps_sess.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/tcps_sess.c b/tcps_sess.c index bc81c299..16fd94f5 100644 --- a/tcps_sess.c +++ b/tcps_sess.c @@ -47,6 +47,7 @@ #include "msg.h" #include "datetime.h" #include "prop.h" +#include "ratelimit.h" #include "debug.h" @@ -264,14 +265,7 @@ defaultDoSubmitMessage(tcps_sess_t *pThis, struct syslogTime *stTime, time_t ttG MsgSetRuleset(pMsg, pThis->pLstnInfo->pRuleset); STATSCOUNTER_INC(pThis->pLstnInfo->ctrSubmit, pThis->pLstnInfo->mutCtrSubmit); - if(pMultiSub == NULL) { - CHKiRet(submitMsg2(pMsg)); - } else { - pMultiSub->ppMsgs[pMultiSub->nElem++] = pMsg; - if(pMultiSub->nElem == pMultiSub->maxElem) - CHKiRet(multiSubmitMsg(pMultiSub)); - } - + ratelimitAddMsg(pThis->pLstnInfo->ratelimiter, pMultiSub, pMsg); finalize_it: /* reset status variables */ @@ -487,11 +481,7 @@ DataRcvd(tcps_sess_t *pThis, char *pData, size_t iLen) while(pData < pEnd) { CHKiRet(processDataRcvd(pThis, *pData++, &stTime, ttGenTime, &multiSub)); } - - if(multiSub.nElem > 0) { - /* submit anything that was not yet submitted */ - CHKiRet(multiSubmitMsg(&multiSub)); - } + iRet = multiSubmitFlush(&multiSub); finalize_it: RETiRet; |