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

Merge pull request #9810 from Icinga/Al2Klimov-patch-8 

ElasticsearchWriter#Pause(): call Flush() only once
This commit is contained in:
Julian Brost 2023-06-30 17:21:16 +02:00 committed by GitHub
parent fdaa96ece1 076eb59443
commit 70d6b6e424
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/perfdata/elasticsearchwriter.cpp
View File

@ -118,10 +118,12 @@ void ElasticsearchWriter::Pause()
m_HandleNotifications.disconnect(); m_HandleNotifications.disconnect();
m_FlushTimer->Stop(true); m_FlushTimer->Stop(true);
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.";