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

IDO-Logging: Add log timeout to log every 5 minutes

Browse Source
This commit is contained in:
Noah Hilverling 2020-10-08 11:35:59 +02:00
parent 7a759a6427
commit be3eb0821a
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/db_ido/dbconnection.cpp
View File

@ -77,6 +77,8 @@ void DbConnection::Resume()
m_CleanUpTimer->OnTimerExpired.connect(std::bind(&DbConnection::CleanUpHandler, this)); m_CleanUpTimer->OnTimerExpired.connect(std::bind(&DbConnection::CleanUpHandler, this));
m_CleanUpTimer->Start(); m_CleanUpTimer->Start();
m_LogStatsTimeout = 0;
m_LogStatsTimer = new Timer(); m_LogStatsTimer = new Timer();
m_LogStatsTimer->SetInterval(10); m_LogStatsTimer->SetInterval(10);
m_LogStatsTimer->OnTimerExpired.connect([this](const Timer * const&) { LogStatsHandler(); }); m_LogStatsTimer->OnTimerExpired.connect([this](const Timer * const&) { LogStatsHandler(); });
@ -245,22 +247,27 @@ void DbConnection::LogStatsHandler()
{ {
auto pending = m_PendingQueries.load(); auto pending = m_PendingQueries.load();
if (pending == 0u) { auto now = Utility::GetTime();
bool timeoutReached = m_LogStatsTimeout < now;
if (pending == 0u && !timeoutReached) {
return; return;
} }
auto now = Utility::GetTime();
auto output = round(m_OutputQueries.CalculateRate(now, 10)); auto output = round(m_OutputQueries.CalculateRate(now, 10));
if (pending < output * 2) { if (pending < output * 2 && !timeoutReached) {
return; return;
} }
auto input = round(m_InputQueries.CalculateRate(now, 10)); auto input = round(m_InputQueries.CalculateRate(now, 10));
String timeInfo = " empty in "; String timeInfo = "";
{ // If we run into our logging timeout, we don't want to display our calculations
// because it should already be basically empty for over 5 minutes.
if (!timeoutReached) {
timeInfo = " empty in ";
auto rate = output - input; auto rate = output - input;
if (rate <= 0) if (rate <= 0)
@ -272,6 +279,11 @@ void DbConnection::LogStatsHandler()
Log(LogInformation, GetReflectionType()->GetName()) Log(LogInformation, GetReflectionType()->GetName())
<< "Pending queries: " << pending << " (Input: " << input << "Pending queries: " << pending << " (Input: " << input
<< "/s; Output: " << output << "/s)" << timeInfo; << "/s; Output: " << output << "/s)" << timeInfo;
/* Reschedule next log entry in 5 minutes. */
if (timeoutReached) {
m_LogStatsTimeout = now + 60 * 5;
}
} }
void DbConnection::CleanUpExecuteQuery(const String&, const String&, double) void DbConnection::CleanUpExecuteQuery(const String&, const String&, double)

2
lib/db_ido/dbconnection.hpp
View File

@ -106,6 +106,8 @@ private:
Timer::Ptr m_CleanUpTimer; Timer::Ptr m_CleanUpTimer;
Timer::Ptr m_LogStatsTimer; Timer::Ptr m_LogStatsTimer;
double m_LogStatsTimeout;
void CleanUpHandler(); void CleanUpHandler();
void LogStatsHandler(); void LogStatsHandler();