diff options
| author | Andre Lorbach <alorbach@adiscon.com> | 2013-07-11 10:56:16 +0200 |
|---|---|---|
| committer | Andre Lorbach <alorbach@adiscon.com> | 2013-07-11 10:56:16 +0200 |
| commit | 53bd9a94ec2c7ad1a009c6fb6655adea48746ca3 (patch) | |
| tree | f03bde08eb331ab76ff97b72a502c51aea3aba2b /plugins/omlibdbi/omlibdbi.c | |
| parent | 57fa85ee7f8c7319f746f238435c4ce6a0c67d95 (diff) | |
| parent | 02f28cd963a206910f2de1c0e1281c69de8dd99e (diff) | |
| download | rsyslog-53bd9a94ec2c7ad1a009c6fb6655adea48746ca3.tar.gz rsyslog-53bd9a94ec2c7ad1a009c6fb6655adea48746ca3.tar.bz2 rsyslog-53bd9a94ec2c7ad1a009c6fb6655adea48746ca3.zip | |
Merge branch 'master' into v7-stats-scripts
Diffstat (limited to 'plugins/omlibdbi/omlibdbi.c')
| -rw-r--r-- | plugins/omlibdbi/omlibdbi.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/plugins/omlibdbi/omlibdbi.c b/plugins/omlibdbi/omlibdbi.c index 6e27ad22..3beba4f0 100644 --- a/plugins/omlibdbi/omlibdbi.c +++ b/plugins/omlibdbi/omlibdbi.c @@ -10,7 +10,7 @@ * * File begun on 2008-02-14 by RGerhards (extracted from syslogd.c) * - * Copyright 2008-2012 Adiscon GmbH. + * Copyright 2008-2013 Adiscon GmbH. * * This file is part of rsyslog. * @@ -340,8 +340,12 @@ CODESTARTbeginTransaction # if HAVE_DBI_TXSUPP if (pData->txSupport == 1) { if (dbi_conn_transaction_begin(pData->conn) != 0) { - dbgprintf("libdbi server error: begin transaction not successful\n"); - iRet = RS_RET_SUSPENDED; + const char *emsg; + dbi_conn_error(pData->conn, &emsg); + dbgprintf("libdbi server error: begin transaction " + "not successful: %s\n", emsg); + closeConn(pData); + ABORT_FINALIZE(RS_RET_SUSPENDED); } } # endif @@ -365,7 +369,11 @@ BEGINendTransaction CODESTARTendTransaction # if HAVE_DBI_TXSUPP if (dbi_conn_transaction_commit(pData->conn) != 0) { - dbgprintf("libdbi server error: transaction not committed\n"); + const char *emsg; + dbi_conn_error(pData->conn, &emsg); + dbgprintf("libdbi server error: transaction not committed: %s\n", + emsg); + closeConn(pData); iRet = RS_RET_SUSPENDED; } # endif |