summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-11-25 14:53:20 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-11-25 14:53:20 +0100
commitc21d381030a5b6ae3bc20a9cfb84c4c04b0922ff (patch)
tree02af25a2ce238b6648391d8dcf577e3360398309 /tools
parent3fb01ebcc0da98fee5fa5f854fad5d347d3f5649 (diff)
parent3313c4d6682993db5ef89b9d55ce910b63e20835 (diff)
downloadrsyslog-c21d381030a5b6ae3bc20a9cfb84c4c04b0922ff.tar.gz
rsyslog-c21d381030a5b6ae3bc20a9cfb84c4c04b0922ff.tar.xz
rsyslog-c21d381030a5b6ae3bc20a9cfb84c4c04b0922ff.zip
Merge branch 'beta'
Conflicts: ChangeLog
Diffstat (limited to 'tools')
-rw-r--r--tools/omfile.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/omfile.c b/tools/omfile.c
index f4945ba0..02bb5cf3 100644
--- a/tools/omfile.c
+++ b/tools/omfile.c
@@ -663,6 +663,8 @@ CODESTARTdoAction
CHKiRet(strm.Flush(pData->pStrm));
}
finalize_it:
+ if(iRet == RS_RET_OK)
+ iRet = RS_RET_DEFER_COMMIT;
ENDdoAction