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

Merge pull request #7126 from Icinga/bugfix/replay-logs-6932

Browse Source 
ApiListener#ApiTimerHandler(): delete all replayed logs
This commit is contained in:
Michael Friedrich 2019-04-23 12:07:02 +02:00 committed by GitHub
commit 5fb191bbeb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/remote/apilistener.cpp
View File

@ -741,11 +741,19 @@ void ApiListener::ApiTimerHandler()
for (int ts : files) { for (int ts : files) {
bool need = false; bool need = false;
auto localZone (GetLocalEndpoint()->GetZone());
for (const Endpoint::Ptr& endpoint : ConfigType::GetObjectsByType<Endpoint>()) { for (const Endpoint::Ptr& endpoint : ConfigType::GetObjectsByType<Endpoint>()) {
if (endpoint == GetLocalEndpoint()) if (endpoint == GetLocalEndpoint())
continue; continue;
auto zone (endpoint->GetZone());
/* only care for endpoints in a) the same zone b) our parent zone c) immediate child zones */
if (!(zone == localZone || zone == localZone->GetParent() || zone->GetParent() == localZone)) {
continue;
}
if (endpoint->GetLogDuration() >= 0 && ts < now - endpoint->GetLogDuration()) if (endpoint->GetLogDuration() >= 0 && ts < now - endpoint->GetLogDuration())
continue; continue;