diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-03-16 15:08:53 +0100 |
| commit | 2fc70320e303fd02b29469416a709a1f8ee4374d (patch) | |
| tree | 9de5d8b20ad8d6e7a6d85c559056a68a68adff1e /tools | |
| parent | 33366f2f1e271f47edeed75f69d9885171e61ea0 (diff) | |
| parent | 9e18ecc9bd14093b78199fd36c315cfce4d26a26 (diff) | |
| download | rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.gz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.tar.xz rsyslog-2fc70320e303fd02b29469416a709a1f8ee4374d.zip | |
Merge branch 'v5-stable' into v5-beta
Conflicts:
tests/Makefile.am
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/syslogd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/syslogd.c b/tools/syslogd.c index dbbdbfec..c9734d14 100644 --- a/tools/syslogd.c +++ b/tools/syslogd.c @@ -799,7 +799,7 @@ DEFFUNC_llExecFunc(flushRptdMsgsActions) DBGPRINTF("flush %s: repeated %d times, %d sec.\n", module.GetStateName(pAction->pMod), pAction->f_prevcount, repeatinterval[pAction->f_repeatcount]); - actionWriteToAction(pAction); + actionWriteToAction(pAction, NULL, 0); BACKOFF(pAction); } UnlockObj(pAction); |