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

Fix ScheduledDowntimes replicating on restart 

fixes #4272
This commit is contained in:
Jean Flach 2018-06-08 10:54:06 +02:00
parent ee37c8c68e
commit 0fc5db82dd
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/icinga/scheduleddowntime.cpp
View File

@ -176,6 +176,9 @@ void ScheduledDowntime::CreateNextDowntime()
return; return;
} }
Log(LogDebug, "ScheduledDowntime")
<< "Creating new Downtime for ScheduledDowntime \"" << GetName() << "\"";
std::pair<double, double> segment = FindNextSegment(); std::pair<double, double> segment = FindNextSegment();
if (segment.first == 0 && segment.second == 0) { if (segment.first == 0 && segment.second == 0) {

4
lib/icinga/scheduleddowntime.ti
View File

@ -36,6 +36,10 @@ public:
class ScheduledDowntime : CustomVarObject < ScheduledDowntimeNameComposer class ScheduledDowntime : CustomVarObject < ScheduledDowntimeNameComposer
{ {
// Scheduled Downtimes have a dependency on Downtimes. This is to make sure ScheduledDowntimes are activated after
// the Downtimes (and other checkables)
activation_priority 20;
load_after Host; load_after Host;
load_after Service; load_after Service;