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

Merge pull request #9349 from Icinga/bugfix/downtime-args

Browse Source 
Fix mixed up arguments for AddDowntime/RemoveDowntime in 2.12.x
This commit is contained in:
Alexander Aleksandrovič Klimov 2022-04-20 11:57:51 +02:00 committed by GitHub
commit 06a909803a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/icinga/apiactions.cpp
View File

@ -457,7 +457,7 @@ Dictionary::Ptr ApiActions::ScheduleDowntime(const ConfigObject::Ptr& object,
<< "Creating downtime for service " << childService->GetName() << " on child host " << childHost->GetName(); << "Creating downtime for service " << childService->GetName() << " on child host " << childHost->GetName();
Downtime::Ptr serviceDowntime = Downtime::AddDowntime(childService, author, comment, startTime, endTime, Downtime::Ptr serviceDowntime = Downtime::AddDowntime(childService, author, comment, startTime, endTime,
fixed, triggerName, duration, String(), String(), childDowntimeName); fixed, triggerName, duration);
String serviceDowntimeName = serviceDowntime->GetName(); String serviceDowntimeName = serviceDowntime->GetName();
childServiceDowntimes.push_back(new Dictionary({ childServiceDowntimes.push_back(new Dictionary({

2
lib/icinga/scheduleddowntime.cpp
View File

@ -323,7 +323,7 @@ void ScheduledDowntime::RemoveObsoleteDowntimes()
auto configOwnerHash (downtime->GetConfigOwnerHash()); auto configOwnerHash (downtime->GetConfigOwnerHash());
if (!configOwnerHash.IsEmpty() && configOwnerHash != downtimeOptionsHash) if (!configOwnerHash.IsEmpty() && configOwnerHash != downtimeOptionsHash)
Downtime::RemoveDowntime(downtime->GetName(), false, true); Downtime::RemoveDowntime(downtime->GetName(), true);
} }
} }
} }