summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2009-12-11 12:17:02 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2009-12-11 12:17:02 +0100
commitc9125981998541b63eaa55c7cdedb46fe2ae2701 (patch)
treeb056e0399c8a8e6cf56effe99bce7aebbb4c64eb
parentabdc2870f1ebbf21a1b865804c512b1ffbeebb3a (diff)
downloadrsyslog-c9125981998541b63eaa55c7cdedb46fe2ae2701.tar.gz
rsyslog-c9125981998541b63eaa55c7cdedb46fe2ae2701.tar.xz
rsyslog-c9125981998541b63eaa55c7cdedb46fe2ae2701.zip
bugfix: ompgsql had problems with transaction support, what actually rendered it unsuable.
Thanks to forum user "horhe" for alerting me on this bug and helping to debug/fix it!
-rw-r--r--ChangeLog3
-rw-r--r--plugins/ompgsql/ompgsql.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 362222f6..37f04988 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ Version 5.3.6 [BETA] (rgerhards), 2009-11-??
Thanks to Jonathan Bond-Caron for the patch.
- bugfix: $CreateDirs variable not properly initialized, default thus
was random (but most often "on") [imported from v3]
+- bugfix: ompgsql had problems with transaction support, what actually
+ rendered it unsuable. Thanks to forum user "horhe" for alerting me
+ on this bug and helping to debug/fix it!
- worked around an issue where omfile failed to compile on 32 bit platforms
under some circumstances (this smells like a gcc problem, but a simple
solution was available). Thanks to Kenneth Marshall for some advice.
diff --git a/plugins/ompgsql/ompgsql.c b/plugins/ompgsql/ompgsql.c
index cb6b6a4d..5a6ad733 100644
--- a/plugins/ompgsql/ompgsql.c
+++ b/plugins/ompgsql/ompgsql.c
@@ -245,7 +245,9 @@ ENDbeginTransaction
BEGINdoAction
CODESTARTdoAction
dbgprintf("\n");
- iRet = writePgSQL(ppString[0], pData);
+ CHKiRet(writePgSQL(ppString[0], pData));
+ iRet = RS_RET_DEFER_COMMIT;
+finalize_it:
ENDdoAction