tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-09-24 10:17:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

On ScheduledDowntime change: remove downtimes created before change

Browse Source 
... to cause their re-creation with the ScheduledDowntime change
taken into account.

refs #8309
This commit is contained in:
Alexander A. Klimov 2020-12-14 15:47:02 +01:00
parent a93f269cab
commit 7874ed6436
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/icinga/downtime.cpp
View File

@ -197,8 +197,33 @@ bool Downtime::HasValidConfigOwner() const
return true;
}
String configOwner = GetConfigOwner();
return configOwner.IsEmpty() || Zone::GetByName(GetAuthoritativeZone()) != Zone::GetLocalZone() || GetObject<ScheduledDowntime>(configOwner);
if (Zone::GetByName(GetAuthoritativeZone()) != Zone::GetLocalZone()) {
return true;
}
ScheduledDowntime::Ptr owner;
{
auto configOwner (GetConfigOwner());
if (configOwner.IsEmpty()) {
return true;
}
owner = GetObject<ScheduledDowntime>(configOwner);
if (!owner) {
return false;
}
}
auto configOwnerHash (GetConfigOwnerHash());
if (configOwnerHash.IsEmpty()) {
return true;
}
return configOwnerHash == owner->HashDowntimeOptions();
}
int Downtime::GetNextDowntimeID()