summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-08-01 10:32:09 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-08-01 10:32:09 +0200
commit5d2a114743a06f1611980ae75d704b2af5ab97ed (patch)
treee13c909a2385e9c39fec6673a18a4cf8a740bc9b
parent4d01df57c2f378ceda3bcc400a9df5e50a0c007b (diff)
downloadrsyslog-5d2a114743a06f1611980ae75d704b2af5ab97ed.zip
rsyslog-5d2a114743a06f1611980ae75d704b2af5ab97ed.tar.gz
rsyslog-5d2a114743a06f1611980ae75d704b2af5ab97ed.tar.xz
undo last queue patch - caused a regression
some more elaborate patch is needed and will be provided
-rw-r--r--ChangeLog4
-rw-r--r--runtime/queue.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index eb8230d..2efbaa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,10 +8,6 @@ Version 5.8.13 [V5-stable] 2012-06-??
- bugfix: randomized IP option header in omudpspoof caused problems
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=327
Thanks to Rick Brown for helping to test out the patch.
-- bugfix: DA queue fixed handling of bad queue files
- If old queue files existed, they were not truncated when being reused.
- This could lead to extra data being read from them and in consequence
- data format errors, which could cause trouble to the queue handler.
- bugfix: potential abort if output plugin logged message during shutdown
note that none of the rsyslog-provided plugins does this
Thanks to bodik and Rohit Prasad for alerting us on this bug and
diff --git a/runtime/queue.c b/runtime/queue.c
index 6a1cf44..280ebd9 100644
--- a/runtime/queue.c
+++ b/runtime/queue.c
@@ -707,7 +707,7 @@ static rsRetVal qConstructDisk(qqueue_t *pThis)
CHKiRet(strm.SetbSync(pThis->tVars.disk.pWrite, pThis->bSyncQueueFiles));
CHKiRet(strm.SetDir(pThis->tVars.disk.pWrite, glbl.GetWorkDir(), strlen((char*)glbl.GetWorkDir())));
CHKiRet(strm.SetiMaxFiles(pThis->tVars.disk.pWrite, 10000000));
- CHKiRet(strm.SettOperationsMode(pThis->tVars.disk.pWrite, STREAMMODE_WRITE_TRUNC));
+ CHKiRet(strm.SettOperationsMode(pThis->tVars.disk.pWrite, STREAMMODE_WRITE));
CHKiRet(strm.SetsType(pThis->tVars.disk.pWrite, STREAMTYPE_FILE_CIRCULAR));
CHKiRet(strm.ConstructFinalize(pThis->tVars.disk.pWrite));