summaryrefslogtreecommitdiffstats
path: root/syslogd.c
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2007-12-12 11:53:05 +0000
committerRainer Gerhards <rgerhards@adiscon.com>2007-12-12 11:53:05 +0000
commit63e31963e2de2062299ae429782422cc88fb5027 (patch)
tree946d778c6e2d7878fe5ac8a8aec1326c5532e11e /syslogd.c
parent26121fcb315b13c9cf06132d4a8cdff0300ff2ea (diff)
downloadrsyslog-63e31963e2de2062299ae429782422cc88fb5027.tar.gz
rsyslog-63e31963e2de2062299ae429782422cc88fb5027.tar.xz
rsyslog-63e31963e2de2062299ae429782422cc88fb5027.zip
some cleanup (very minor)
Diffstat (limited to 'syslogd.c')
-rw-r--r--syslogd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/syslogd.c b/syslogd.c
index 3abb77e4..e9e822eb 100644
--- a/syslogd.c
+++ b/syslogd.c
@@ -2476,6 +2476,7 @@ static rsRetVal callAction(msg_t *pMsg, action_t *pAction)
dbgprintf("msg repeated %d times, %ld sec of %d.\n",
pAction->f_prevcount, time(NULL) - pAction->f_time,
repeatinterval[pAction->f_repeatcount]);
+ /* use current message, so we have the new timestamp (means we need to discard previous one) */
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
@@ -3469,7 +3470,10 @@ domark(void)
MarkSeq = 0;
}
- /* see if we need to flush any "message repeated n times"... */
+ /* see if we need to flush any "message repeated n times"...
+ * Note that this interferes with objects running on another thread.
+ * We are using appropriate locking inside the function to handle that.
+ */
for (f = Files; f != NULL ; f = f->f_next) {
llExecFunc(&f->llActList, domarkActions, NULL);
}