Attachment 204961 Details for Bug 303341 – Proposed patch

[patch] Proposed patch

rsyslog-1.19.6-repmsg.patch (text/plain), 1.13 KB, created by Tomas Mraz on 2007-09-25 08:22:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Mraz

Created: 2007-09-25 08:22:22 UTC

Size: 1.13 KB

patch

obsolete

>diff -up rsyslog-1.19.6/syslogd.c.repmsg rsyslog-1.19.6/syslogd.c
>--- rsyslog-1.19.6/syslogd.c.repmsg	2007-09-11 17:35:08.000000000 +0200
>+++ rsyslog-1.19.6/syslogd.c	2007-09-25 10:01:58.000000000 +0200
>@@ -2466,11 +2466,15 @@ static rsRetVal callAction(msg_t *pMsg, 
> 	if ((pAction->f_ReduceRepeated == 1) && pAction->f_pMsg != NULL &&
> 	    (pMsg->msgFlags & MARK) == 0 && getMSGLen(pMsg) == getMSGLen(pAction->f_pMsg) &&
> 	    !strcmp(getMSG(pMsg), getMSG(pAction->f_pMsg)) &&
>-	    !strcmp(getHOSTNAME(pMsg), getHOSTNAME(pAction->f_pMsg))) {
>+	    !strcmp(getHOSTNAME(pMsg), getHOSTNAME(pAction->f_pMsg)) &&
>+	    !strcmp(getPROCID(pMsg), getPROCID(pAction->f_pMsg)) &&
>+	    !strcmp(getAPPNAME(pMsg), getAPPNAME(pAction->f_pMsg))) {
> 		pAction->f_prevcount++;
> 		dbgprintf("msg repeated %d times, %ld sec of %d.\n",
> 		    pAction->f_prevcount, now - pAction->f_time,
> 		    repeatinterval[pAction->f_repeatcount]);
>+		MsgDestruct(pAction->f_pMsg);
>+		pAction->f_pMsg = MsgAddRef(pMsg);
> 		/* If domark would have logged this by now, flush it now (so we don't hold
> 		 * isolated messages), but back off so we'll flush less often in the future.
> 		 */

Actions: View | Diff

Attachments on bug 303341: 204961