Fix ScheduledDowntimes replicating on restart

fixes #4272

diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
index d8120691ff05b5e16272e5659002c3e029865edb..6a715fc401ae1f4c04a620a71dc4a4660ab40cec 100644 (file)
--- a/lib/icinga/scheduleddowntime.cpp
+++ b/lib/icinga/scheduleddowntime.cpp
@@ -176,6 +176,9 @@ void ScheduledDowntime::CreateNextDowntime()
                return;
        }
 
+       Log(LogDebug, "ScheduledDowntime")
+               << "Creating new Downtime for ScheduledDowntime \"" << GetName() << "\"";
+
        std::pair<double, double> segment = FindNextSegment();
 
        if (segment.first == 0 && segment.second == 0) {

diff --git a/lib/icinga/scheduleddowntime.ti b/lib/icinga/scheduleddowntime.ti
index 10e88417bce4eec1bee2643542c5c269b8722d60..e119eaa11b73323aa9575ce0a3b499cb142bf5de 100644 (file)
--- a/lib/icinga/scheduleddowntime.ti
+++ b/lib/icinga/scheduleddowntime.ti
@@ -36,6 +36,10 @@ public:
 
 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 Service;