Merge pull request #9818 from Icinga/2.13.8/ElasticsearchWriter-Pause

ElasticsearchWriter#Pause(): call Flush() only once
This commit is contained in:
Alexander Aleksandrovič Klimov 2023-07-06 10:17:57 +02:00 committed by GitHub
commit 56a22461c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -117,9 +117,12 @@ void ElasticsearchWriter::Pause()
m_HandleStateChanges.disconnect(); m_HandleStateChanges.disconnect();
m_HandleNotifications.disconnect(); m_HandleNotifications.disconnect();
Flush();
m_WorkQueue.Join(); m_WorkQueue.Join();
Flush();
{
std::unique_lock<std::mutex> lock (m_DataBufferMutex);
Flush();
}
Log(LogInformation, "ElasticsearchWriter") Log(LogInformation, "ElasticsearchWriter")
<< "'" << GetName() << "' paused."; << "'" << GetName() << "' paused.";