rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-20 01:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix: bFlushOnTxEnd == 0 not honored when writing w/o async writer

Browse Source 
If bFlushOnTXEnd is set, we need to flush on transaction end - in
any case. It is not relevant if this is using background writes
(which then become pretty slow) or not. And, similarly, no flush
happens when it is not set.

closes https://github.com/rsyslog/rsyslog/issues/1297
This commit is contained in:
Rainer Gerhards 2017-01-13 13:51:37 +01:00
parent 1c8da91c9f
commit 7619ad2c20
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/omfile.c
View File

@ -17,7 +17,7 @@
* pipes. These have been moved to ompipe, to reduced the entanglement
* between the two different functionalities. -- rgerhards
*
* Copyright 2007-2016 Adiscon GmbH.
* Copyright 2007-2017 Adiscon GmbH.
*
* This file is part of rsyslog.
*
@ -1046,14 +1046,16 @@ CODESTARTcommitTransaction
writeFile(pData, pParams, i);
}
/* Note: pStrm may be NULL if there was an error opening the stream */
if(pData->bUseAsyncWriter) {
if(pData->bFlushOnTXEnd && pData->pStrm != NULL) {
CHKiRet(strm.Flush(pData->pStrm));
}
} else {
if(pData->pStrm != NULL) {
CHKiRet(strm.Flush(pData->pStrm));
}
/* if bFlushOnTXEnd is set, we need to flush on transaction end - in
* any case. It is not relevant if this is using background writes
* (which then become pretty slow) or not. And, similarly, no flush
* happens when it is not set. Please see
* https://github.com/rsyslog/rsyslog/issues/1297
* for a discussion of why we actually need this.
* rgerhards, 2017-01-13
*/
if(pData->bFlushOnTXEnd && pData->pStrm != NULL) {
CHKiRet(strm.Flush(pData->pStrm));
}
finalize_it: