diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 10:03:30 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-19 10:03:30 +0200 |
commit | a7c5807346d3f8d4ae54f3dada580a026e4747ec (patch) | |
tree | 4bf372bfde8703dd7f80639a1a9e05aab20bbf74 | |
parent | e65473e9a4b04788c70bb7d9ef8f9d7dd7ecd124 (diff) | |
download | rsyslog-a7c5807346d3f8d4ae54f3dada580a026e4747ec.tar.gz rsyslog-a7c5807346d3f8d4ae54f3dada580a026e4747ec.tar.bz2 rsyslog-a7c5807346d3f8d4ae54f3dada580a026e4747ec.zip |
imklog, impstats: support for new rate-limiting API added
-rw-r--r-- | plugins/imklog/imklog.c | 8 | ||||
-rw-r--r-- | plugins/impstats/impstats.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/plugins/imklog/imklog.c b/plugins/imklog/imklog.c index 2897d76d..6eed33fe 100644 --- a/plugins/imklog/imklog.c +++ b/plugins/imklog/imklog.c @@ -101,11 +101,8 @@ static struct cnfparamblk modpblk = modpdescr }; - - static prop_t *pInputName = NULL; /* there is only one global inputName for all messages generated by this module */ -static prop_t *pLocalHostIP = NULL; /* a pseudo-constant propterty for 127.0.0.1 */ - +static prop_t *pLocalHostIP = NULL; static inline void initConfigSettings(void) @@ -148,7 +145,8 @@ enqMsg(uchar *msg, uchar* pszTag, int iFacility, int iSeverity, struct timeval * MsgSetTAG(pMsg, pszTag, ustrlen(pszTag)); pMsg->iFacility = iFacility; pMsg->iSeverity = iSeverity; - CHKiRet(submitMsg(pMsg)); + /* note: we do NOT use rate-limiting, as the kernel itself does rate-limiting */ + CHKiRet(submitMsg2(pMsg)); finalize_it: RETiRet; diff --git a/plugins/impstats/impstats.c b/plugins/impstats/impstats.c index 62599969..9bd11556 100644 --- a/plugins/impstats/impstats.c +++ b/plugins/impstats/impstats.c @@ -138,7 +138,8 @@ doSubmitMsg(uchar *line) pMsg->iSeverity = runModConf->iSeverity; pMsg->msgFlags = 0; - submitMsg(pMsg); + /* we do not use rate-limiting, as the stats message always need to be emitted */ + submitMsg2(pMsg); finalize_it: RETiRet; |