Skip to content

Commit 9d40de7

Browse files
committed
Address comments from review
1 parent abf2fb3 commit 9d40de7

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

lib/icinga/checkable-check.cpp

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,21 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr
344344

345345
cr->SetVarsAfter(vars_after);
346346

347-
bool problem_change = false;
348347
if (service) {
349348
SetLastCheckResult(cr);
350349
} else {
351350
bool wasProblem = GetProblem();
351+
352352
SetLastCheckResult(cr);
353-
problem_change = GetProblem() != wasProblem;
353+
354+
if (GetProblem() != wasProblem) {
355+
auto services = host->GetServices();
356+
for (auto& service : services) {
357+
Service::OnHostProblemChanged(service, cr, origin);
358+
}
359+
}
354360
}
361+
355362
bool was_flapping = IsFlapping();
356363

357364
UpdateFlappingStatus(cr->GetState());
@@ -501,13 +508,7 @@ Checkable::ProcessingResult Checkable::ProcessCheckResult(const CheckResult::Ptr
501508
if ((stateChange || hardChange) && !children.empty() && (affectsPreviousStateChildren || AffectsChildren()))
502509
OnReachabilityChanged(this, cr, children, origin);
503510

504-
olock->Unlock();
505-
if (!service && problem_change) {
506-
auto services = host->GetServices();
507-
for (auto& service : services) {
508-
Service::OnHostProblemChanged(service, cr, origin);
509-
}
510-
}
511+
olock.Unlock();
511512

512513
if (recovery) {
513514
for (auto& child : children) {

0 commit comments

Comments
 (0)