From: Gunnar Beutner <gunnar.beutner@netways.de>
Date: Tue, 17 May 2016 08:32:38 +0000 (+0200)
Subject: Fix PostgreSQL warnings on startup
X-Git-Tag: v2.4.8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=refs%2Ftags%2Fv2.4.8;p=icinga2

Fix PostgreSQL warnings on startup

fixes #11798
---

diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp
index a71e7b389..fefaa9183 100644
--- a/lib/db_ido_mysql/idomysqlconnection.cpp
+++ b/lib/db_ido_mysql/idomysqlconnection.cpp
@@ -337,6 +337,8 @@ void IdoMysqlConnection::Reconnect(void)
 	/* set session time zone to utc */
 	Query("SET SESSION TIME_ZONE='+00:00'");
 
+	Query("BEGIN");
+
 	/* update programstatus table */
 	UpdateProgramStatus();
 
@@ -370,8 +372,6 @@ void IdoMysqlConnection::Reconnect(void)
 			activeDbObjs.push_back(dbobj);
 	}
 
-	Query("BEGIN");
-
 	BOOST_FOREACH(const DbObject::Ptr& dbobj, activeDbObjs) {
 		if (dbobj->GetObject() == NULL) {
 			Log(LogNotice, "IdoMysqlConnection")
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index 93f72f9d1..6bd6f0332 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -324,6 +324,8 @@ void IdoPgsqlConnection::Reconnect(void)
 	Log(LogInformation, "IdoPgsqlConnection")
 	    << "pgSQL IDO instance id: " << static_cast<long>(m_InstanceID) << " (schema version: '" + version + "')";
 
+	Query("BEGIN");
+
 	/* update programstatus table */
 	UpdateProgramStatus();
 
@@ -360,8 +362,6 @@ void IdoPgsqlConnection::Reconnect(void)
 			activeDbObjs.push_back(dbobj);
 	}
 
-	Query("BEGIN");
-
 	BOOST_FOREACH(const DbObject::Ptr& dbobj, activeDbObjs) {
 		if (dbobj->GetObject() == NULL) {
 			Log(LogNotice, "IdoPgsqlConnection")