From: Michael Friedrich <michael.friedrich@netways.de>
Date: Tue, 8 Jul 2014 11:48:11 +0000 (+0200)
Subject: DB IDO: Reset reconnect timer before pausing the connection
X-Git-Tag: v2.0.1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f19cc514b9dc119cbd22cd95ae350ed43c33673a;p=icinga2

DB IDO: Reset reconnect timer before pausing the connection

refs #6414
---

diff --git a/components/db_ido_mysql/idomysqlconnection.cpp b/components/db_ido_mysql/idomysqlconnection.cpp
index 54955cb22..c37058e11 100644
--- a/components/db_ido_mysql/idomysqlconnection.cpp
+++ b/components/db_ido_mysql/idomysqlconnection.cpp
@@ -84,10 +84,10 @@ void IdoMysqlConnection::Resume(void)
 
 void IdoMysqlConnection::Pause(void)
 {
-	DbConnection::Pause();
-
 	m_ReconnectTimer.reset();
 
+	DbConnection::Pause();
+
 	m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::Disconnect, this));
 	m_QueryQueue.Join();
 }
diff --git a/components/db_ido_pgsql/idopgsqlconnection.cpp b/components/db_ido_pgsql/idopgsqlconnection.cpp
index c27e4659f..fa63eb3c4 100644
--- a/components/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/components/db_ido_pgsql/idopgsqlconnection.cpp
@@ -86,10 +86,10 @@ void IdoPgsqlConnection::Resume(void)
 
 void IdoPgsqlConnection::Pause(void)
 {
-	DbConnection::Pause();
-
 	m_ReconnectTimer.reset();
 
+	DbConnection::Pause();
+
 	m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::Disconnect, this));
 	m_QueryQueue.Join();
 }