tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix PostgreSQL warnings on startup 

fixes #11798
This commit is contained in:
Gunnar Beutner 2016-05-17 10:32:38 +02:00
parent 49558420f9
commit eadd61c7e4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -337,6 +337,8 @@ void IdoMysqlConnection::Reconnect(void)
/* set session time zone to utc */ /* set session time zone to utc */
Query("SET SESSION TIME_ZONE='+00:00'"); Query("SET SESSION TIME_ZONE='+00:00'");
Query("BEGIN");
/* update programstatus table */ /* update programstatus table */
UpdateProgramStatus(); UpdateProgramStatus();
@ -370,8 +372,6 @@ void IdoMysqlConnection::Reconnect(void)
activeDbObjs.push_back(dbobj); activeDbObjs.push_back(dbobj);
} }
Query("BEGIN");
BOOST_FOREACH(const DbObject::Ptr& dbobj, activeDbObjs) { BOOST_FOREACH(const DbObject::Ptr& dbobj, activeDbObjs) {
if (dbobj->GetObject() == NULL) { if (dbobj->GetObject() == NULL) {
Log(LogNotice, "IdoMysqlConnection") Log(LogNotice, "IdoMysqlConnection")

4
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -324,6 +324,8 @@ void IdoPgsqlConnection::Reconnect(void)
Log(LogInformation, "IdoPgsqlConnection") Log(LogInformation, "IdoPgsqlConnection")
<< "pgSQL IDO instance id: " << static_cast<long>(m_InstanceID) << " (schema version: '" + version + "')"; << "pgSQL IDO instance id: " << static_cast<long>(m_InstanceID) << " (schema version: '" + version + "')";
Query("BEGIN");
/* update programstatus table */ /* update programstatus table */
UpdateProgramStatus(); UpdateProgramStatus();
@ -360,8 +362,6 @@ void IdoPgsqlConnection::Reconnect(void)
activeDbObjs.push_back(dbobj); activeDbObjs.push_back(dbobj);
} }
Query("BEGIN");
BOOST_FOREACH(const DbObject::Ptr& dbobj, activeDbObjs) { BOOST_FOREACH(const DbObject::Ptr& dbobj, activeDbObjs) {
if (dbobj->GetObject() == NULL) { if (dbobj->GetObject() == NULL) {
Log(LogNotice, "IdoPgsqlConnection") Log(LogNotice, "IdoPgsqlConnection")