diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-20 12:58:48 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-08-20 12:58:48 +0200 |
| commit | 0f52727043736b1e411bc60309ed18d41a4f1234 (patch) | |
| tree | 97fd6c1defe93abc97717c4ae3d598166f7ad402 /dirty.h | |
| parent | 7c1ad1c77cc3884931bd2c9e2d2f45db892a15a0 (diff) | |
| parent | 4a24d8e1b63a27d8c20f2d3d614fcdc2bcb52a01 (diff) | |
| download | rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.gz rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.tar.xz rsyslog-0f52727043736b1e411bc60309ed18d41a4f1234.zip | |
Merge branch 'beta' into v6-stable
Diffstat (limited to 'dirty.h')
| -rw-r--r-- | dirty.h | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -30,7 +30,7 @@ rsRetVal multiSubmitMsg(multi_submit_t *pMultiSub); rsRetVal submitMsg(msg_t *pMsg); rsRetVal logmsgInternal(int iErr, int pri, uchar *msg, int flags); -rsRetVal parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int flags, flowControl_t flowCtlTypeu, prop_t *pInputName, struct syslogTime *stTime, time_t ttGenTime); +rsRetVal parseAndSubmitMessage(uchar *hname, uchar *hnameIP, uchar *msg, int len, int flags, flowControl_t flowCtlTypeu, prop_t *pInputName, struct syslogTime *stTime, time_t ttGenTime, ruleset_t *pRuleset); rsRetVal diagGetMainMsgQSize(int *piSize); /* for imdiag */ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName); @@ -41,8 +41,9 @@ rsRetVal createMainQueue(qqueue_t **ppQueue, uchar *pszQueueName); */ extern int MarkInterval; extern int repeatinterval[2]; -extern int bReduceRepeatMsgs; extern qqueue_t *pMsgQueue; /* the main message queue */ +extern int iConfigVerify; /* is this just a config verify run? */ +extern int bHaveMainQueue; #define MAXREPEAT ((int)((sizeof(repeatinterval) / sizeof(repeatinterval[0])) - 1)) #define REPEATTIME(f) ((f)->f_time + repeatinterval[(f)->f_repeatcount]) #define BACKOFF(f) { if (++(f)->f_repeatcount > MAXREPEAT) \ |