tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-25 14:44:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Deduplicate DbConnection#Disconnect() in #Pause()

Browse Source 
refs #8727
This commit is contained in:
Alexander A. Klimov 2021-04-20 18:42:37 +02:00
parent 0d34d8951a
commit 92df2ce2ca
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/db_ido/dbconnection.cpp
View File

@ -112,6 +112,8 @@ void DbConnection::Pause()
NewTransaction(); NewTransaction();
m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
/* Work on remaining tasks but never delete the threads, for HA resuming later. */ /* Work on remaining tasks but never delete the threads, for HA resuming later. */
m_QueryQueue.Join(); m_QueryQueue.Join();

2
lib/db_ido_mysql/idomysqlconnection.cpp
View File

@ -105,8 +105,6 @@ void IdoMysqlConnection::Pause()
<< "Rescheduling disconnect task."; << "Rescheduling disconnect task.";
#endif /* I2_DEBUG */ #endif /* I2_DEBUG */
m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
Log(LogInformation, "IdoMysqlConnection") Log(LogInformation, "IdoMysqlConnection")
<< "'" << GetName() << "' paused."; << "'" << GetName() << "' paused.";

2
lib/db_ido_pgsql/idopgsqlconnection.cpp
View File

@ -104,8 +104,6 @@ void IdoPgsqlConnection::Pause()
m_ReconnectTimer.reset(); m_ReconnectTimer.reset();
m_QueryQueue.Enqueue([this]() { Disconnect(); }, PriorityLow);
Log(LogInformation, "IdoPgsqlConnection") Log(LogInformation, "IdoPgsqlConnection")
<< "'" << GetName() << "' paused."; << "'" << GetName() << "' paused.";
} }