Merge pull request #8863 from Icinga/bugfix/harden-scheduled-downtimes-212

N-o-X · web-flow · commit 4fb27a45cbda · 2021-07-07T10:39:44.000+02:00
ScheduledDowntime::TimerProc(): Catch exceptions to make sure other downtimes are still created
diff --git a/lib/icinga/scheduleddowntime.cpp b/lib/icinga/scheduleddowntime.cpp
@@ -87,8 +87,15 @@ void ScheduledDowntime::Start(bool runtimeCreated)
 void ScheduledDowntime::TimerProc()
 {
 	for (const ScheduledDowntime::Ptr& sd : ConfigType::GetObjectsByType<ScheduledDowntime>()) {
-		if (sd->IsActive() && !sd->IsPaused())
-			sd->CreateNextDowntime();
+		if (sd->IsActive() && !sd->IsPaused()) {
+			try {
+				sd->CreateNextDowntime();
+			} catch (const std::exception& ex) {
+				Log(LogCritical, "ScheduledDowntime")
+					<< "Exception occurred during creation of next downtime for scheduled downtime '"
+					<< sd->GetName() << "': " << DiagnosticInformation(ex, false);
+			}
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -87,8 +87,15 @@ void ScheduledDowntime::Start(bool runtimeCreated)`
`87`	`87`	`void ScheduledDowntime::TimerProc()`
`88`	`88`	`{`
`89`	`89`	`for (const ScheduledDowntime::Ptr& sd : ConfigType::GetObjectsByType<ScheduledDowntime>()) {`
`90`		`- if (sd->IsActive() && !sd->IsPaused())`
`91`		`- sd->CreateNextDowntime();`
	`90`	`+ if (sd->IsActive() && !sd->IsPaused()) {`
	`91`	`+ try {`
	`92`	`+ sd->CreateNextDowntime();`
	`93`	`+ } catch (const std::exception& ex) {`
	`94`	`+ Log(LogCritical, "ScheduledDowntime")`
	`95`	`+ << "Exception occurred during creation of next downtime for scheduled downtime '"`
	`96`	`+ << sd->GetName() << "': " << DiagnosticInformation(ex, false);`
	`97`	`+ }`
	`98`	`+ }`
`92`	`99`	`}`
`93`	`100`	`}`
`94`	`101`